This addresses the q35 + qemu 2.11 boot problems,
as OVMF gets updated to a current release.
I inline the diff between v1..v2 to see easier what changed:
--
diff --git a/Makefile b/Makefile
index 831dcff..d24eacc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
PACKAGE=pve-edk2-firmware
-VER=1.$(shell date -d @$$(dpkg-parsechangelog -S timestamp) '+%Y%m%d')
-PKGREL=1
+# version and package release is controlled over d/changelog
+VER=$(shell dpkg-parsechangelog -S version)
SRCDIR=edk2
BUILDDIR=${SRCDIR}.build
GITVERSION:=$(shell git rev-parse HEAD)
-DEB=${PACKAGE}_${VER}-${PKGREL}_all.deb
+DEB=${PACKAGE}_${VER}_all.deb
all: ${DEB}
@echo ${DEB}
@@ -18,8 +18,8 @@ ${DEB}: | submodule
rm -rf ${BUILDDIR}
cp -rpa ${SRCDIR} ${BUILDDIR}
cp -a debian ${BUILDDIR}
- echo "git clone git://git.proxmox.com/git/pve-guest-fw-edk2.git\\ngit
checkout ${GITVERSION}" > ${BUILDDIR}/debian/SOURCE
- cd ${BUILDDIR}; dpkg-buildpackage -rfakeroot -b -uc -us
+ echo "git clone git://git.proxmox.com/git/pve-edk2-firmware.git\\ngit
checkout ${GITVERSION}" > ${BUILDDIR}/debian/SOURCE
+ cd ${BUILDDIR}; dpkg-buildpackage -b -uc -us
lintian ${DEB}
@echo ${DEB}
@@ -33,7 +33,7 @@ update_modules: submodule
.PHONY: upload
upload: ${DEB}
- tar cf - ${DEB}|ssh -X [email protected] -- upload --product
pmg,pve --dist stretch
+ tar cf - ${DEB}|ssh -X [email protected] -- upload --product pve
--dist stretch
.PHONY: distclean
distclean: clean
diff --git a/debian/changelog b/debian/changelog
index e038242..0c8ab6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
-pve-edk2-firmware (1.20180313-1) stable; urgency=medium
+pve-edk2-firmware (1.20180316-1) stable; urgency=medium
- * Initial release.
+ * updated to newer OVMF release (commit
+ d0976b9accedfd1f45fe2f81c59351ed17f34aa0)
- -- Proxmox Support Team <[email protected]> Tue, 13 Mar 2018 11:20:02 +0200
+ * build from source instead of tracking binary rreleases (BLOBs)
+
+ * split from pve-qemu into separate package
+
+ -- Proxmox Support Team <[email protected]> Fri, 16 Mar 2018 12:10:02 +0200
diff --git a/debian/control b/debian/control
index aa917e6..31b4100 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: pve-edk2-firmware
Section: misc
Priority: extra
Maintainer: Proxmox Support Team <[email protected]>
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 9),
iasl,
nasm,
python,
@@ -13,9 +13,8 @@ Standards-Version: 3.9.8
Package: pve-edk2-firmware
Architecture: all
Depends: ${misc:Depends},
-Provides: ovmf,
-Conflicts: ovmf,
Description: edk2 based firmware modules for virtual machines
Contains OVMF. Open Virtual Machine Firmware (OVMF) is a build of EDK II for
virtual machines. It includes full support for UEFI, including Secure Boot,
allowing use of UEFI in place of a traditional BIOS in your VM.
+ Proxmox VE specific release with disabled secure boot.
diff --git a/debian/pve-edk2-firmware.install b/debian/pve-edk2-firmware.install
index 839354c..1c99312 100644
--- a/debian/pve-edk2-firmware.install
+++ b/debian/pve-edk2-firmware.install
@@ -1,3 +1,2 @@
-Build/OvmfX64/RELEASE_*GCC*/FV/OVMF.fd /usr/share/ovmf
-Build/OvmfX64/RELEASE_*GCC*/FV/OVMF_CODE.fd /usr/share/OVMF
-Build/OvmfX64/RELEASE_*GCC*/FV/OVMF_VARS.fd /usr/share/OVMF
+Build/OvmfX64/RELEASE_*GCC*/FV/OVMF_CODE.fd /usr/share/pve-edk2-firmware
+Build/OvmfX64/RELEASE_*GCC*/FV/OVMF_VARS.fd /usr/share/pve-edk2-firmware
diff --git a/debian/pve-edk2-firmware.links b/debian/pve-edk2-firmware.links
deleted file mode 100644
index b308b69..0000000
--- a/debian/pve-edk2-firmware.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/ovmf/OVMF.fd usr/share/qemu/OVMF.fd
diff --git a/debian/rules b/debian/rules
index 0464134..da3cc01 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,11 +39,13 @@ build-ovmf: EDK2_ARCH_DIR=X64
build-ovmf: EDK2_HOST_ARCH=X64
build-ovmf: setup-build
set -e; . ./edksetup.sh; \
- OvmfPkg/build.sh -a $(EDK2_HOST_ARCH) -b RELEASE
-DSECURE_BOOT_ENABLE=FALSE -DFD_SIZE_2MB \
- -n $$(getconf _NPROCESSORS_ONLN) -t $(EDK2_TOOLCHAIN)
-
-build-qemu-efi-aarch64:
- $(MAKE) -f debian/rules build-qemu-efi EDK2_ARCH_DIR=AArch64
EDK2_HOST_ARCH=AARCH64 FW_NAME=AAVMF
+ OvmfPkg/build.sh \
+ -b RELEASE \
+ -a $(EDK2_HOST_ARCH) \
+ -t $(EDK2_TOOLCHAIN) \
+ -DSECURE_BOOT_ENABLE=FALSE \
+ -DFD_SIZE_2MB \
+ -n $$(getconf _NPROCESSORS_ONLN)
override_dh_auto_clean:
set -e; \
diff --git a/edk2 b/edk2
index ea30f8e..d0976b9 160000
--- a/edk2
+++ b/edk2
@@ -1 +1 @@
-Subproject commit ea30f8e81399059e2a94b597d05d3273893afe7b
+Subproject commit d0976b9accedfd1f45fe2f81c59351ed17f34aa0
_______________________________________________
pve-devel mailing list
[email protected]
https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
