[pve-devel] [RFC pve-qemu 2/2] use new separate package for OVMF

Thomas Lamprecht t.lamprecht at proxmox.com
Wed Oct 4 16:35:36 CEST 2017


Signed-off-by: Thomas Lamprecht <t.lamprecht at proxmox.com>
---
 debian/Logo.bmp              | Bin 49078 -> 0 bytes
 debian/OVMF_CODE-pure-efi.fd | Bin 1966080 -> 0 bytes
 debian/OVMF_README.txt       |  11 -----------
 debian/OVMF_VARS-pure-efi.fd | Bin 131072 -> 0 bytes
 debian/control               |   1 +
 debian/pve-qemu-kvm.links    |   2 ++
 debian/rules                 |   4 ----
 7 files changed, 3 insertions(+), 15 deletions(-)
 delete mode 100644 debian/Logo.bmp
 delete mode 100644 debian/OVMF_CODE-pure-efi.fd
 delete mode 100644 debian/OVMF_README.txt
 delete mode 100644 debian/OVMF_VARS-pure-efi.fd
 create mode 100644 debian/pve-qemu-kvm.links

diff --git a/debian/Logo.bmp b/debian/Logo.bmp
deleted file mode 100644
index 4c46dd8..0000000
Binary files a/debian/Logo.bmp and /dev/null differ
diff --git a/debian/OVMF_CODE-pure-efi.fd b/debian/OVMF_CODE-pure-efi.fd
deleted file mode 100644
index 807676d..0000000
Binary files a/debian/OVMF_CODE-pure-efi.fd and /dev/null differ
diff --git a/debian/OVMF_README.txt b/debian/OVMF_README.txt
deleted file mode 100644
index 7085e29..0000000
--- a/debian/OVMF_README.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-The OVMF images were built through the edk2 github repository.
-
-git clone https://github.com/tianocore/edk2
-
-set up the build environment
-
-copy the Logo.bmp to ./edk2/MdeModulePkg/Logo/
-
-call ./edk2/OvmfPkg/build.sh -a X64 -b RELEASE
-
-The license is under ./edk2/OvmfPkg/License.txt
diff --git a/debian/OVMF_VARS-pure-efi.fd b/debian/OVMF_VARS-pure-efi.fd
deleted file mode 100644
index 3b8bb9b..0000000
Binary files a/debian/OVMF_VARS-pure-efi.fd and /dev/null differ
diff --git a/debian/control b/debian/control
index 68ba534..c974de1 100644
--- a/debian/control
+++ b/debian/control
@@ -43,6 +43,7 @@ Depends: ceph-common (>= 0.48),
          libuuid1,
          numactl,
          pve-libspice-server1 (>= 0.12.5-1),
+         pve-guest-fw-edk2,
          python,
          ${misc:Depends},
          ${shlibs:Depends},
diff --git a/debian/pve-qemu-kvm.links b/debian/pve-qemu-kvm.links
new file mode 100644
index 0000000..66a23f0
--- /dev/null
+++ b/debian/pve-qemu-kvm.links
@@ -0,0 +1,2 @@
+usr/share/OVMF/OVMF_CODE.fd usr/share/kvm/OVMF_CODE-pure-efi.fd
+usr/share/OVMF/OVMF_VARS.fd usr/share/kvm/OVMF_VARS-pure-efi.fd
diff --git a/debian/rules b/debian/rules
index 98637c7..a0de789 100755
--- a/debian/rules
+++ b/debian/rules
@@ -95,10 +95,6 @@ install: build
 	install -D -m 0755 $(CURDIR)/debian/kvm-ifup $(destdir)/etc/kvm/kvm-ifup
 	install -D -m 0755 $(CURDIR)/debian/kvm-ifdown $(destdir)/etc/kvm/kvm-ifdown
 
-	#install ovmf uefi rom
-	install -D -m 0644 $(CURDIR)/debian/OVMF_CODE-pure-efi.fd $(destdir)/usr/share/kvm/OVMF_CODE-pure-efi.fd
-	install -D -m 0644 $(CURDIR)/debian/OVMF_VARS-pure-efi.fd $(destdir)/usr/share/kvm/OVMF_VARS-pure-efi.fd
-
 	# we do not need openbios files (sparc/ppc)
 	rm -rf $(destdir)/usr/share/kvm/openbios-*
 	# remove ppc files
-- 
2.11.0




More information about the pve-devel mailing list