stubdom now default, 4.15.0-1

5 files changed, 114 insertions, 87 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a6bd4cdaf62d..1b46afd1ccb2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xen
 	pkgdesc = Open-source type-1 or baremetal hypervisor
-	pkgver = 4.14.1
+	pkgver = 4.15.0
 	pkgrel = 1
 	url = https://xenproject.org/
 	arch = x86_64
@@ -24,7 +24,7 @@ pkgbase = xen
 	makedepends = vde2
 	makedepends = lzo
 	makedepends = pciutils
-	makedepends = sdl
+	makedepends = sdl2
 	makedepends = wget
 	makedepends = pandoc
 	makedepends = valgrind
@@ -37,51 +37,26 @@ pkgbase = xen
 	makedepends = pixman
 	makedepends = ocaml
 	makedepends = fig2dev
-	makedepends = cmake
-	noextract = gmp-4.3.2.tar.bz2
-	noextract = grub-0.97.tar.gz
-	noextract = lwip-1.3.0.tar.gz
-	noextract = newlib-1.16.0.tar.gz
-	noextract = pciutils-2.2.9.tar.bz2
-	noextract = polarssl-1.1.4-gpl.tgz
-	noextract = tpm_emulator-0.7.4.tar.gz
-	noextract = zlib-1.2.3.tar.gz
 	options = !buildflags
-	source = https://downloads.xenproject.org/release/xen/4.14.1/xen-4.14.1.tar.gz
-	source = https://downloads.xenproject.org/release/xen/4.14.1/xen-4.14.1.tar.gz.sig
+	source = https://downloads.xenproject.org/release/xen/4.15.0/xen-4.15.0.tar.gz
+	source = https://downloads.xenproject.org/release/xen/4.15.0/xen-4.15.0.tar.gz.sig
 	source = efi-xen.cfg
 	source = xen.conf
 	source = tmpfiles.conf
 	source = xen-ucode-extract.sh
 	source = xen-intel-ucode.hook
 	source = xen-amd-ucode.hook
-	source = xen_4.14.1_fixes.patch
-	source = http://xenbits.xen.org/xen-extfiles/gmp-4.3.2.tar.bz2
-	source = http://xenbits.xen.org/xen-extfiles/grub-0.97.tar.gz
-	source = http://xenbits.xen.org/xen-extfiles/lwip-1.3.0.tar.gz
-	source = http://xenbits.xen.org/xen-extfiles/newlib-1.16.0.tar.gz
-	source = http://xenbits.xen.org/xen-extfiles/pciutils-2.2.9.tar.bz2
-	source = http://xenbits.xen.org/xen-extfiles/polarssl-1.1.4-gpl.tgz
-	source = http://xenbits.xen.org/xen-extfiles/tpm_emulator-0.7.4.tar.gz
-	source = http://xenbits.xen.org/xen-extfiles/zlib-1.2.3.tar.gz
+	source = no-ld-no-pie.patch
 	validpgpkeys = 23E3222C145F4475FA8060A783FE14C957E82BD9
-	sha512sums = c75cbec82793435f5a7026626ffdb2e9a2166b42d2be4b2f1194240e0312458124f0ebd53eeb02ce7330c22afe402a28a96b32f8af66e41e9416fe94535724c9
-	sha512sums = SKIP
+	sha512sums = 93683b8a97387ca5f003c635a11d163e61c87dbdc9a03081f9155fe87b49f1dfa74ce243fcd5e04dc009353a36e2375b786f1ebde828b5951a094cd64197b4c7
+	sha512sums = 7ca2894ece626a116e03f0e3e2ddf36c7cf26b1db0eef410bb93acae32897042b087f670a416b13c5df8f1c8bd9d848ad075f1ce8a651b3341ec20b56daf21ae
 	sha512sums = 1bbcbcd9fb8344a207409ec9f0064a45b726416f043f902ca587f5e4fa58497a759be4ffd584fa32318e960aa478864cc05ec026c444e8d27ca8e3248bd67420
 	sha512sums = ccaa2ff82e4203b11e5dec9aeccac2e165721d8067e0094603ecaa7a70b78c9eb9e2287a32687883d26b6ceae6f8d2ad7636ddf949eb658637b3ceaa6999711b
 	sha512sums = 53ba61587cc2e84044e935531ed161e22c36d9e90b43cab7b8e63bcc531deeefacca301b5dff39ce89210f06f1d1e4f4f5cf49d658ed5d9038c707e3c95c66ef
 	sha512sums = a9230ec6ef9636ac3f3e4b72b1747ee8c4648a8bf4bd8dc3650365e34f1f67474429dbdd24996907d277b0ff5f235574643e781cb3ff37da954e899ddadbe0d6
 	sha512sums = 7a832de9b35f4b77ee80d33310b23886f4d48d1d42c3d6ef6f8e2b428bec7332a285336864b61cfa01d9a14c2023674015beb7527bd5849b069f2be88e6500cd
 	sha512sums = 99921b94a29fa7988c7fb5c17da8e598e777c972d6cae8c8643c991e5ff911a25525345ea8913945313d5c49fecf9da8cc3b83d47ab03928341e917b304370a9
-	sha512sums = 75c0f3a30c726484b1701ba369ae84e9d4362367a843c5e962945192156b9f15a17b92f9fbf50395e22edc6159e8ceb30d751a7b09944bf5a1a37d0a98c82583
-	sha512sums = 2e0b0fd23e6f10742a5517981e5171c6e88b0a93c83da701b296f5c0861d72c19782daab589a7eac3f9032152a0fc7eff7f5362db8fccc4859564a9aa82329cf
-	sha512sums = c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb
-	sha512sums = 1465b58279af1647f909450e394fe002ca165f0ff4a0254bfa9fe0e64316f50facdde2729d79a4e632565b4500cf4d6c74192ac0dd3bc9fe09129bbd67ba089d
-	sha512sums = 40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3
-	sha512sums = 2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5
-	sha512sums = 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad
-	sha512sums = 4928b5b82f57645be9408362706ff2c4d9baa635b21b0d41b1c82930e8c60a759b1ea4fa74d7e6c7cae1b7692d006aa5cb72df0c3b88bf049779aa2b566f9d35
-	sha512sums = 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e
+	sha512sums = 72edbacdb2b3b4449448e1bf7a6b31b58234eed1abe010db6dcf4033158edf095b081bc6eb89cde3156432dd35c449e1954aeefb2c4bc785a5d3f93de7b0fa76
 
 pkgname = xen
 	pkgdesc = Open-source type-1 or baremetal hypervisor
@@ -105,11 +80,12 @@ pkgname = xen
 	depends = vde2
 	depends = lzo
 	depends = pciutils
-	depends = sdl
-	optdepends = ed2k-ovmf: UEFI support
+	depends = sdl2
+	optdepends = edk2-ovmf: UEFI support
 	optdepends = seabios: SeaBIOS payload support
 	optdepends = xen-docs: HTML documentation and man pages
 	optdepends = grub-xen-git: GRUB and pvgrub2 bootloader support
+	optdepends = linux-headers: extract bootable non-zstd kernel for recent kernels
 	optdepends = qemu: HVM and PV support
 	backup = etc/conf.d/xencommons
 	backup = etc/conf.d/xendomains
diff --git a/ChangeLog b/ChangeLog
index 861d2ff4aa99..19762e696c3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-15 Sam Mulvey
+	* 4.15.0-1
+	* stubdom build now defaults false
+
 2021-01-12 Sam Mulvey
 	* 4.14.1-1
 
diff --git a/PKGBUILD b/PKGBUILD
index c0d1bec69a80..907baf36f7b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Chris Chapman (cman) <chris.chapman@aggiemail.usu.edu>
 
 # Build Options
-_build_stubdom=${build_stubdom:-true}
+_build_stubdom=${build_stubdom:-false}
 _build_qemu=${build_qemu:-true}
 
 # Check http://xenbits.xen.org/xen-extfiles/ for updates
@@ -18,7 +18,7 @@ _zlib=1.2.3
 
 pkgbase=xen
 pkgname=("xen" "xen-docs")
-pkgver=4.14.1
+pkgver=4.15.0
 pkgrel=1
 pkgdesc='Open-source type-1 or baremetal hypervisor'
 arch=('x86_64')
@@ -30,12 +30,12 @@ options=(!buildflags)
 makedepends=(
 	'zlib' 'python' 'ncurses' 'openssl' 'libx11' 'libuuid.so' 'yajl' 'libaio' 'glib2' 'pkgconf'
 	'bridge-utils' 'iproute2' 'inetutils' 'acpica' 'lib32-glibc' 'gnutls'
-	'vde2' 'lzo' 'pciutils' 'sdl'
+	'vde2' 'lzo' 'pciutils' 'sdl2'
 ) # last line from namcap, these depends are the xen depends
 # Actual makedepends.
 makedepends+=('wget' 'pandoc' 'valgrind' 'git' 'bin86' 'dev86' 'bison' 'gettext' 'flex' 'pixman' 'ocaml' 'fig2dev')
 
-source=(
+_source=(
 	"https://downloads.xenproject.org/release/xen/$pkgver/$pkgname-$pkgver.tar.gz"{,.sig}
 	"efi-xen.cfg"
 	"xen.conf"
@@ -43,14 +43,19 @@ source=(
 	"xen-ucode-extract.sh"
 	"xen-intel-ucode.hook"
 	"xen-amd-ucode.hook"
-	"xen_4.14.1_fixes.patch"
+	"no-ld-no-pie.patch"
 )
 
+validpgpkeys=('23E3222C145F4475FA8060A783FE14C957E82BD9') # Xen.org Xen tree code signing (signatures on the xen hypervisor and tools) <pgp@xen.org>
+
 
 # Follow the Xen securite mailing lists, and if a patch is applicable to our package
 # add the URL here.
-_patches=()
+_patches=(
+)
 
+
+# Sources required for building stubdom
 _stubdom_source=(
 	"http://xenbits.xen.org/xen-extfiles/gmp-$_gmp.tar.bz2"
 	"http://xenbits.xen.org/xen-extfiles/grub-$_grub.tar.gz"
@@ -63,34 +68,47 @@ _stubdom_source=(
 )
 
 
-sha512sums=(
-	'c75cbec82793435f5a7026626ffdb2e9a2166b42d2be4b2f1194240e0312458124f0ebd53eeb02ce7330c22afe402a28a96b32f8af66e41e9416fe94535724c9'
-	'SKIP'
-	'1bbcbcd9fb8344a207409ec9f0064a45b726416f043f902ca587f5e4fa58497a759be4ffd584fa32318e960aa478864cc05ec026c444e8d27ca8e3248bd67420'
-	'ccaa2ff82e4203b11e5dec9aeccac2e165721d8067e0094603ecaa7a70b78c9eb9e2287a32687883d26b6ceae6f8d2ad7636ddf949eb658637b3ceaa6999711b'
-	'53ba61587cc2e84044e935531ed161e22c36d9e90b43cab7b8e63bcc531deeefacca301b5dff39ce89210f06f1d1e4f4f5cf49d658ed5d9038c707e3c95c66ef'
-	'a9230ec6ef9636ac3f3e4b72b1747ee8c4648a8bf4bd8dc3650365e34f1f67474429dbdd24996907d277b0ff5f235574643e781cb3ff37da954e899ddadbe0d6'
-	'7a832de9b35f4b77ee80d33310b23886f4d48d1d42c3d6ef6f8e2b428bec7332a285336864b61cfa01d9a14c2023674015beb7527bd5849b069f2be88e6500cd'
-	'99921b94a29fa7988c7fb5c17da8e598e777c972d6cae8c8643c991e5ff911a25525345ea8913945313d5c49fecf9da8cc3b83d47ab03928341e917b304370a9'
-	'75c0f3a30c726484b1701ba369ae84e9d4362367a843c5e962945192156b9f15a17b92f9fbf50395e22edc6159e8ceb30d751a7b09944bf5a1a37d0a98c82583'
+# from cheap hack known as break_out_sums.sh
+_sha512sums=(
+	"93683b8a97387ca5f003c635a11d163e61c87dbdc9a03081f9155fe87b49f1dfa74ce243fcd5e04dc009353a36e2375b786f1ebde828b5951a094cd64197b4c7" # xen-4.15.0.tar.gz
+	"7ca2894ece626a116e03f0e3e2ddf36c7cf26b1db0eef410bb93acae32897042b087f670a416b13c5df8f1c8bd9d848ad075f1ce8a651b3341ec20b56daf21ae" # xen-4.15.0.tar.gz.sig
+	"1bbcbcd9fb8344a207409ec9f0064a45b726416f043f902ca587f5e4fa58497a759be4ffd584fa32318e960aa478864cc05ec026c444e8d27ca8e3248bd67420" # efi-xen.cfg
+	"ccaa2ff82e4203b11e5dec9aeccac2e165721d8067e0094603ecaa7a70b78c9eb9e2287a32687883d26b6ceae6f8d2ad7636ddf949eb658637b3ceaa6999711b" # xen.conf
+	"53ba61587cc2e84044e935531ed161e22c36d9e90b43cab7b8e63bcc531deeefacca301b5dff39ce89210f06f1d1e4f4f5cf49d658ed5d9038c707e3c95c66ef" # tmpfiles.conf
+	"a9230ec6ef9636ac3f3e4b72b1747ee8c4648a8bf4bd8dc3650365e34f1f67474429dbdd24996907d277b0ff5f235574643e781cb3ff37da954e899ddadbe0d6" # xen-ucode-extract.sh
+	"7a832de9b35f4b77ee80d33310b23886f4d48d1d42c3d6ef6f8e2b428bec7332a285336864b61cfa01d9a14c2023674015beb7527bd5849b069f2be88e6500cd" # xen-intel-ucode.hook
+	"99921b94a29fa7988c7fb5c17da8e598e777c972d6cae8c8643c991e5ff911a25525345ea8913945313d5c49fecf9da8cc3b83d47ab03928341e917b304370a9" # xen-amd-ucode.hook
+	"72edbacdb2b3b4449448e1bf7a6b31b58234eed1abe010db6dcf4033158edf095b081bc6eb89cde3156432dd35c449e1954aeefb2c4bc785a5d3f93de7b0fa76" # no-ld-no-pie.patch
+)
+
+_patch_sums=(
 )
 
 
 _stub_sums=(
-	'2e0b0fd23e6f10742a5517981e5171c6e88b0a93c83da701b296f5c0861d72c19782daab589a7eac3f9032152a0fc7eff7f5362db8fccc4859564a9aa82329cf'
-	'c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb'
-	'1465b58279af1647f909450e394fe002ca165f0ff4a0254bfa9fe0e64316f50facdde2729d79a4e632565b4500cf4d6c74192ac0dd3bc9fe09129bbd67ba089d'
-	'40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3'
-	'2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5'
-	'88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad'
-	'4928b5b82f57645be9408362706ff2c4d9baa635b21b0d41b1c82930e8c60a759b1ea4fa74d7e6c7cae1b7692d006aa5cb72df0c3b88bf049779aa2b566f9d35'
-	'021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e'
+	"2e0b0fd23e6f10742a5517981e5171c6e88b0a93c83da701b296f5c0861d72c19782daab589a7eac3f9032152a0fc7eff7f5362db8fccc4859564a9aa82329cf" # gmp-4.3.2.tar.bz2
+	"c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb" # grub-0.97.tar.gz
+	"1465b58279af1647f909450e394fe002ca165f0ff4a0254bfa9fe0e64316f50facdde2729d79a4e632565b4500cf4d6c74192ac0dd3bc9fe09129bbd67ba089d" # lwip-1.3.0.tar.gz
+	"40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3" # newlib-1.16.0.tar.gz
+	"2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5" # pciutils-2.2.9.tar.bz2
+	"88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad" # polarssl-1.1.4-gpl.tgz
+	"4928b5b82f57645be9408362706ff2c4d9baa635b21b0d41b1c82930e8c60a759b1ea4fa74d7e6c7cae1b7692d006aa5cb72df0c3b88bf049779aa2b566f9d35" # tpm_emulator-0.7.4.tar.gz
+	"021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e" # zlib-1.2.3.tar.gz
 )
 
 
-# Patch and stubdum handling
 
-source=("${source[@]}" "${_patches[@]}")
+# Simplify things for makepkg
+source=( "${_source[@]}" "${_patches[@]}" )
+sha512sums=( "${_sha512sums[@]}" "${_patch_sums[@]}" )
+
+for file in "${_patches[@]}"; do
+	noextract+=( $(basename ${file}) )
+done
+
+
+
+# stubdum handling
 if [ "${_build_stubdom}" == "true" ]; then
 	source=("${source[@]}" "${_stubdom_source[@]}")
 	sha512sums=("${sha512sums[@]}" "${_stub_sums[@]}")
@@ -114,7 +132,6 @@ else
 fi
 
 
-validpgpkeys=('23E3222C145F4475FA8060A783FE14C957E82BD9') # Xen.org Xen tree code signing (signatures on the xen hypervisor and tools) <pgp@xen.org>
 
 
 # TODO: Setup users, dirs, etc.
@@ -123,8 +140,7 @@ prepare() {
 
 	cd "${pkgbase}-${pkgver}"
 
-	# mostly from: https://github.com/olafhering/xen/commit/1a1d86fef44444e8e265fd8bc687f8238a0d1615
-	patch -p1 < ../xen_4.14.1_fixes.patch
+	patch -p1 < ../no-ld-no-pie.patch
 
 	if [ "${_build_stubdom}" == "true" ]; then
 
@@ -135,11 +151,10 @@ prepare() {
 	fi
 
 
-	for patch in "${patches[@]}"; do
-		if [[ $patch =~ ^xsa ]]; then
-			echo "==> Applying security patch '${patch}'..."
-			patch -p1 < "../${patch}"
-		fi
+	for patchurl in "${_patches[@]}"; do
+		patch=$(basename $patchurl)
+		echo "==> Applying security patch '${patch}'..."
+		patch -p1 < "../${patch}"
 	done
 
 	# Fix Install Paths.
@@ -184,14 +199,15 @@ package_xen() {
 	depends=(
 		'zlib' 'python' 'ncurses' 'openssl' 'libx11' 'libuuid.so' 'yajl' 'libaio' 'glib2' 'pkgconf'
 		'bridge-utils' 'iproute2' 'inetutils' 'acpica' 'lib32-glibc' 'gnutls'
-		'vde2' 'lzo' 'pciutils' 'sdl'
+		'vde2' 'lzo' 'pciutils' 'sdl2'
 	)
 
 	optdepends=(
-		'ed2k-ovmf: UEFI support'
+		'edk2-ovmf: UEFI support'
 		'seabios: SeaBIOS payload support'
 		'xen-docs: HTML documentation and man pages'
 		'grub-xen-git: GRUB and pvgrub2 bootloader support'
+		'linux-headers: extract bootable non-zstd kernel for recent kernels'
 	)
 
 	if [ "${_build_qemu}" == "false" ]; then
@@ -248,10 +264,10 @@ package_xen() {
 	install -D -m 0644 "${srcdir}/tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/${pkgbase}.conf"
 
 	# microcode hooks
-	mkdir -p "${pkgdir}/usr/share/libalpm/scripts" "${pkgdir}/usr/share/libalpm/hooks"
-	install -m755 "${srcdir}/xen-ucode-extract.sh" "${pkgdir}/usr/share/libalpm/scripts"
-	install -m644 "${srcdir}/xen-intel-ucode.hook" "${pkgdir}/usr/share/libalpm/hooks"
-	install -m644 "${srcdir}/xen-amd-ucode.hook"   "${pkgdir}/usr/share/libalpm/hooks"
+	mkdir -p "${pkgdir}/usr/share/libalpm/scripts"     "${pkgdir}/usr/share/libalpm/hooks"
+	install -m755 "${srcdir}/xen-ucode-extract.sh"     "${pkgdir}/usr/share/libalpm/scripts"
+	install -m644 "${srcdir}/xen-intel-ucode.hook"     "${pkgdir}/usr/share/libalpm/hooks"
+	install -m644 "${srcdir}/xen-amd-ucode.hook"       "${pkgdir}/usr/share/libalpm/hooks"
 
 	# Remove documentation (included in separate xen-docs package).
 	rm -r "${pkgdir}/usr/share/doc"
diff --git a/no-ld-no-pie.patch b/no-ld-no-pie.patch
new file mode 100644
index 000000000000..c858154d6199
--- /dev/null
+++ b/no-ld-no-pie.patch
@@ -0,0 +1,43 @@
+diff -Naur orig.xen-4.15.0/tools/qemu-xen/configure xen-4.15.0/tools/qemu-xen/configure
+--- orig.xen-4.15.0/tools/qemu-xen/configure	2021-04-14 21:21:12.452569711 -0700
++++ xen-4.15.0/tools/qemu-xen/configure	2021-04-15 00:28:33.297563599 -0700
+@@ -2184,7 +2184,6 @@
+ # Check we support --no-pie first; we will need this for building ROMs.
+ if compile_prog "-Werror -fno-pie" "-no-pie"; then
+   CFLAGS_NOPIE="-fno-pie"
+-  LDFLAGS_NOPIE="-no-pie"
+ fi
+ 
+ if test "$static" = "yes"; then
+@@ -2200,7 +2199,6 @@
+   fi
+ elif test "$pie" = "no"; then
+   QEMU_CFLAGS="$CFLAGS_NOPIE $QEMU_CFLAGS"
+-  QEMU_LDFLAGS="$LDFLAGS_NOPIE $QEMU_LDFLAGS"
+ elif compile_prog "-Werror -fPIE -DPIE" "-pie"; then
+   QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS"
+   QEMU_LDFLAGS="-pie $QEMU_LDFLAGS"
+@@ -7996,7 +7994,6 @@
+   echo "QEMU_CFLAGS  += -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-non-pointer-null" >> $config_host_mak
+ fi
+ echo "QEMU_LDFLAGS=$QEMU_LDFLAGS" >> $config_host_mak
+-echo "LDFLAGS_NOPIE=$LDFLAGS_NOPIE" >> $config_host_mak
+ echo "LD_REL_FLAGS=$LD_REL_FLAGS" >> $config_host_mak
+ echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_host_mak
+ echo "LIBS+=$LIBS" >> $config_host_mak
+diff -Naur orig.xen-4.15.0/tools/qemu-xen/pc-bios/optionrom/Makefile xen-4.15.0/tools/qemu-xen/pc-bios/optionrom/Makefile
+--- orig.xen-4.15.0/tools/qemu-xen/pc-bios/optionrom/Makefile	2021-04-14 21:22:40.942571012 -0700
++++ xen-4.15.0/tools/qemu-xen/pc-bios/optionrom/Makefile	2021-04-15 00:29:15.334688505 -0700
+@@ -47,10 +47,10 @@
+ 	$(call quiet-command,$(CPP) $(QEMU_INCLUDES) $(QEMU_DGFLAGS) -c -o - $< | $(AS) $(ASFLAGS) -o $@,"AS","$(TARGET_DIR)$@")
+ 
+ pvh.img: pvh.o pvh_main.o
+-	$(call quiet-command,$(LD) $(LDFLAGS_NOPIE) -m $(LD_I386_EMULATION) -T $(SRC_PATH)/pc-bios/optionrom/flat.lds -s -o $@ $^,"BUILD","$(TARGET_DIR)$@")
++	$(call quiet-command,$(LD) -m $(LD_I386_EMULATION) -T $(SRC_PATH)/pc-bios/optionrom/flat.lds -s -o $@ $^,"BUILD","$(TARGET_DIR)$@")
+ 
+ %.img: %.o
+-	$(call quiet-command,$(LD) $(LDFLAGS_NOPIE) -m $(LD_I386_EMULATION) -T $(SRC_PATH)/pc-bios/optionrom/flat.lds -s -o $@ $<,"BUILD","$(TARGET_DIR)$@")
++	$(call quiet-command,$(LD) -m $(LD_I386_EMULATION) -T $(SRC_PATH)/pc-bios/optionrom/flat.lds -s -o $@ $<,"BUILD","$(TARGET_DIR)$@")
+ 
+ %.raw: %.img
+ 	$(call quiet-command,$(OBJCOPY) -O binary -j .text $< $@,"BUILD","$(TARGET_DIR)$@")
diff --git a/xen_4.14.1_fixes.patch b/xen_4.14.1_fixes.patch
deleted file mode 100644
index 4f1f87b2a37f..000000000000
--- a/xen_4.14.1_fixes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur orig/stubdom/vtpmmgr/vtpmmgr.h changed/stubdom/vtpmmgr/vtpmmgr.h
---- orig/stubdom/vtpmmgr/vtpmmgr.h	2020-05-14 05:19:32.000000000 -0700
-+++ changed/stubdom/vtpmmgr/vtpmmgr.h	2020-05-20 12:04:28.506666463 -0700
-@@ -50,7 +50,7 @@
- #define RSA_KEY_SIZE 0x0800
- #define RSA_CIPHER_SIZE (RSA_KEY_SIZE / 8)
- 
--enum {
-+extern enum {
-     TPM1_HARDWARE = 1,
-     TPM2_HARDWARE,
- } tpm_version;