From e47e5ee41d0282c8cbd4c2e4aeb133b2209c3713 Mon Sep 17 00:00:00 2001
From: Kim Hagen <kim.sidney@gmail.com>
Date: Tue, 16 Apr 2019 14:49:53 +0200
Subject: update ova template to use debian8 and pvscsi

---
 scripts/template.ovf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/template.ovf b/scripts/template.ovf
index cc2ec845..87237bf7 100644
--- a/scripts/template.ovf
+++ b/scripts/template.ovf
@@ -87,7 +87,7 @@
       <Info/>
       <Annotation>VyOS</Annotation>
     </AnnotationSection>
-    <OperatingSystemSection ovf:id="100" ovf:version="1" vmw:osType="other3xLinux64Guest">
+    <OperatingSystemSection ovf:id="100" ovf:version="1" vmw:osType="debian8_64Guest">
       <Info>Guest Operating System</Info>
       <Description>VyOS</Description>
     </OperatingSystemSection>
@@ -148,9 +148,9 @@
       </Item>
       <Item>
         <rasd:Address xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">0</rasd:Address>
-        <rasd:ElementName xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">SCSI Controller 0 - LSI Logic</rasd:ElementName>
+        <rasd:ElementName xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">SCSI Controller 0</rasd:ElementName>
         <rasd:InstanceID xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">3</rasd:InstanceID>
-        <rasd:ResourceSubType>lsilogic</rasd:ResourceSubType>
+        <rasd:ResourceSubType>VirtualSCSI</rasd:ResourceSubType>
         <rasd:ResourceType>6</rasd:ResourceType>
       </Item>
       <Item>
-- 
cgit v1.2.3


From 946872f66ba4f60c0164bb4dcb2b64a5da6d4722 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 16 Apr 2019 08:00:34 +0200
Subject: [firmware] T1274: add additional QLogic firmware files

(cherry picked from commit acf492894fe8a9cda5ccc6cecf4c1033299e36ee)
---
 data/live-build-config/hooks/live/40-linux-firmware.chroot | 1 -
 1 file changed, 1 deletion(-)

diff --git a/data/live-build-config/hooks/live/40-linux-firmware.chroot b/data/live-build-config/hooks/live/40-linux-firmware.chroot
index 5f826884..cd944faf 100755
--- a/data/live-build-config/hooks/live/40-linux-firmware.chroot
+++ b/data/live-build-config/hooks/live/40-linux-firmware.chroot
@@ -22,7 +22,6 @@ RM_FIRMWARE=" \
     radeon \
     matrox \
     mediatek \
-    qed \
     sb16 \
     ti-connectivity \
     ueagle-atm \
-- 
cgit v1.2.3