4.14.0-1

1 files changed, 50 insertions, 47 deletions

diff --git a/PKGBUILD b/PKGBUILD
index caffe987b8eb..6933ba23a009 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,11 +3,11 @@
 
 # Build Options
 _build_stubdom=${build_stubdom:-true}
+_build_qemu=${build_qemu:-true}
 
 # Check http://xenbits.xen.org/xen-extfiles/ for updates
 _gmp=4.3.2
 _grub=0.97
-_ipxe=1dd56dbd11082fb622c2ed21cfaced4f47d798a6
 _lwip=1.3.0
 _newlib=1.16.0
 _pciutils=2.2.9
@@ -17,27 +17,24 @@ _zlib=1.2.3
 
 pkgbase=xen
 pkgname=("xen" "xen-docs")
-pkgver=4.13.1
-pkgrel=4
+pkgver=4.14.0
+pkgrel=1
 pkgdesc='Open-source type-1 or baremetal hypervisor'
 arch=('x86_64')
 url='https://xenproject.org/'
 license=('GPL2')
+options=(!buildflags)
 
+# Original depends line
 makedepends=('zlib' 'python' 'ncurses' 'openssl' 'libx11' 'libuuid.so' 'yajl' 'libaio' 'glib2' 'pkgconf'
          'bridge-utils' 'iproute2' 'inetutils' 'acpica' 'lib32-glibc' 'gnutls'
 		 'vde2' 'lzo' 'pciutils' 'sdl') # last line from namcap, these depends are the xen depends
-makedepends+=('wget' 'pandoc' 'valgrind' 'git' 'bin86' 'dev86' 'bison' 'gettext' 'flex' 'pixman' 'ocaml')
+# Actual makedepends.
+makedepends+=('wget' 'pandoc' 'valgrind' 'git' 'bin86' 'dev86' 'bison' 'gettext' 'flex' 'pixman' 'ocaml' 'fig2dev')
 
-options=(!buildflags)
-_source=("https://downloads.xenproject.org/release/xen/$pkgver/$pkgname-$pkgver.tar.gz"{,.sig}
-		"http://xenbits.xen.org/xen-extfiles/ipxe-git-$_ipxe.tar.gz"
-		"https://src.fedoraproject.org/rpms/xen/raw/master/f/xen.gcc10.fixes.patch"
-		"https://src.fedoraproject.org/rpms/xen/raw/master/f/xen.ocaml.4.10.patch"
-		"xen_gcc10_1_omnibus.patch"
-		"grub-mkconfig-helper"
+source=("https://downloads.xenproject.org/release/xen/$pkgver/$pkgname-$pkgver.tar.gz"{,.sig}
+		"xen_4.14.0_fixes.patch"
 		"efi-xen.cfg"
-		"grub.conf"
 		"xen.conf"
 		"tmpfiles.conf"
 		"xen-ucode-extract.sh"
@@ -53,37 +50,17 @@ _stubdom_source=("http://xenbits.xen.org/xen-extfiles/gmp-$_gmp.tar.bz2"
 				"http://xenbits.xen.org/xen-extfiles/tpm_emulator-$_tpm_emulator.tar.gz"
 				"http://xenbits.xen.org/xen-extfiles/zlib-$_zlib.tar.gz")
 
-noextract=("ipxe-git-$_ipxe.tar.gz")
-
-
-if [ "${_build_stubdom}" == "true" ]; then
-	source=("${_source[@]}" "${_stubdom_source[@]}")
-
-	for file in "${_stubdom_source[@]}"; do
-		noextract+=( $(basename ${file}) )
-	done
-
-	_config_stubdom='--enable-stubdom'
-else
-	_config_stubdom='--disable-stubdom'
-fi
-
-
-sha512sums=('b56d20704155d98d803496cba83eb928e0f986a750831cd5600fc88d0ae772fe1456571654375054043d2da8daca255cc98385ebf08b1b1a75ecf7f4b7a0ee90'
+sha512sums=('ebce47a2f754955d8517123d69f62006634d97620fbbe3784869a0667466e586a249f57ffaf7846d5bcb45d69377cde43354c82c233fbb5407e55653b9a33ac0'
             'SKIP'
-            '8120696ba6d79fd9189664deed9b0489825d8d1edf7b931023b3979b7b9f82248e5b808c4517036cd40a85442ddf51a8dcad3b05d7f3c3cc6650654d53da4050'
-            'a93b8f33a38af4434fb1fa0e1e24d6374105f7c6088fc011eccdd5d5576ad78152bf27b675ef37471bd6b45468f75499c08e0bb937ee880557acba3edec98a07'
-            'abacb29fde9b583648651a076cc8697538dea51d7fcc8c2160e951548e7022a0c83c89ddac3d1b3e46e05cb265e8fe14c0d9248d055e914909232180b42b194f'
-            'eac4aaaaee05b8c0de88a78ba45329c4344b42c8d34651a6f7e99a7c7f16bfb9933a26fffbc5fb5d22e8561d07dfc13fe591aacb5f9a1d49aa725b253aad03ec'
-            '1e95d8767bb0d4df6d95ac1f29e7fa7a74b4483f8bb46efcf95e08ddc9481d17c8e315f095e8d5ebf6e319811099e083566acc45aa3803aa4de4e8d17af04180'
+            '95b489d8ce2ba85ba48a50d8b5e087c9f3955a2750a16206502e3fdaa2bbbcb2a316586c78ae02937659cb862ddb10479bd0139a77b7dd4235bf07bb7982ee14'
             '1bbcbcd9fb8344a207409ec9f0064a45b726416f043f902ca587f5e4fa58497a759be4ffd584fa32318e960aa478864cc05ec026c444e8d27ca8e3248bd67420'
-            '72b58aa4e2d0ba1242d789000f9a9df0969461b5eca119f92a9d5980e4340b6b2f502aac42b62bb85c9f580067e6120b79e6a30f961e7aa88394738a3ba2cc4c'
             'ccaa2ff82e4203b11e5dec9aeccac2e165721d8067e0094603ecaa7a70b78c9eb9e2287a32687883d26b6ceae6f8d2ad7636ddf949eb658637b3ceaa6999711b'
             '53ba61587cc2e84044e935531ed161e22c36d9e90b43cab7b8e63bcc531deeefacca301b5dff39ce89210f06f1d1e4f4f5cf49d658ed5d9038c707e3c95c66ef'
             'a9230ec6ef9636ac3f3e4b72b1747ee8c4648a8bf4bd8dc3650365e34f1f67474429dbdd24996907d277b0ff5f235574643e781cb3ff37da954e899ddadbe0d6'
             '7a832de9b35f4b77ee80d33310b23886f4d48d1d42c3d6ef6f8e2b428bec7332a285336864b61cfa01d9a14c2023674015beb7527bd5849b069f2be88e6500cd'
-            '99921b94a29fa7988c7fb5c17da8e598e777c972d6cae8c8643c991e5ff911a25525345ea8913945313d5c49fecf9da8cc3b83d47ab03928341e917b304370a9'
-            '2e0b0fd23e6f10742a5517981e5171c6e88b0a93c83da701b296f5c0861d72c19782daab589a7eac3f9032152a0fc7eff7f5362db8fccc4859564a9aa82329cf'
+            '99921b94a29fa7988c7fb5c17da8e598e777c972d6cae8c8643c991e5ff911a25525345ea8913945313d5c49fecf9da8cc3b83d47ab03928341e917b304370a9')
+
+_stub_sums=('2e0b0fd23e6f10742a5517981e5171c6e88b0a93c83da701b296f5c0861d72c19782daab589a7eac3f9032152a0fc7eff7f5362db8fccc4859564a9aa82329cf'
             'c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb'
             '1465b58279af1647f909450e394fe002ca165f0ff4a0254bfa9fe0e64316f50facdde2729d79a4e632565b4500cf4d6c74192ac0dd3bc9fe09129bbd67ba089d'
             '40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3'
@@ -92,6 +69,25 @@ sha512sums=('b56d20704155d98d803496cba83eb928e0f986a750831cd5600fc88d0ae772fe145
             '4928b5b82f57645be9408362706ff2c4d9baa635b21b0d41b1c82930e8c60a759b1ea4fa74d7e6c7cae1b7692d006aa5cb72df0c3b88bf049779aa2b566f9d35'
             '021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e')
 
+if [ "${_build_stubdom}" == "true" ]; then
+	source=("${source[@]}" "${_stubdom_source[@]}")
+	sha512sums=("${sha512sums[@]}" "${_stub_sums[@]}")
+
+	for file in "${_stubdom_source[@]}"; do
+		noextract+=( $(basename ${file}) )
+	done
+
+	_config_stubdom='--enable-stubdom'
+else
+	_config_stubdom='--disable-stubdom'
+fi
+
+if [ "${_build_qemu}" == "true" ]; then
+	_config_qemu=""
+else
+	_config_qemu="--with-system-qemu=/usr/bin/qemu-system-x86_64"
+fi
+
 
 validpgpkeys=('23E3222C145F4475FA8060A783FE14C957E82BD9') # Xen.org Xen tree code signing (signatures on the xen hypervisor and tools) <pgp@xen.org>
 
@@ -101,9 +97,8 @@ validpgpkeys=('23E3222C145F4475FA8060A783FE14C957E82BD9') # Xen.org Xen tree cod
 prepare() {
 	cd "${pkgbase}-${pkgver}"
 
-	patch -p1 < ../xen.gcc10.fixes.patch
-	patch -p1 < ../xen.ocaml.4.10.patch
-	patch -p1 < ../xen_gcc10_1_omnibus.patch
+	# mostly from: https://github.com/olafhering/xen/commit/1a1d86fef44444e8e265fd8bc687f8238a0d1615
+	patch -p1 < ../xen_4.14.0_fixes.patch
 
 	if [ "${_build_stubdom}" == "true" ]; then
 
@@ -113,8 +108,6 @@ prepare() {
 
 	fi
 
-	cp ../ipxe-git-$_ipxe.tar.gz tools/firmware/etherboot/ipxe.tar.gz
-
 	# Fix Install Paths.
 	sed 's,/var/run,/run,g' -i tools/hotplug/Linux/locking.sh
 	sed 's,/var/run,/run,g' -i tools/misc/xenpvnetboot
@@ -126,6 +119,14 @@ prepare() {
 build() {
 	cd "${pkgbase}-${pkgver}"
 
+	if [ "${_build_stubdom}" == "true" ]; then
+		echo "NOTE: Xen build with stubdom support."
+	fi
+
+	if [ "${_build_qemu}" == "true" ]; then
+		echo "NOTE: Xen build with integrated QEMU."
+	fi
+
 
 	./configure \
 		--prefix=/usr \
@@ -135,9 +136,9 @@ build() {
 		--enable-systemd \
 		--disable-qemu-traditional \
 		${_config_stubdom} \
+		${_config_qemu} \
 		--with-sysconfig-leaf-dir=conf.d \
 		--with-system-ovmf=/usr/share/ovmf/x64/OVMF.fd \
-		--with-system-qemu=/usr/bin/qemu-system-x86_64 \
 		--with-system-seabios=/usr/share/qemu/bios-256k.bin
 
 	make XEN_VENDORVERSION=arch
@@ -152,7 +153,12 @@ package_xen() {
 
 	optdepends=('ed2k-ovmf: UEFI support'
             	'seabios: SeaBIOS payload support'
-				'xen-docs: HTML documentation and man pages')
+				'xen-docs: HTML documentation and man pages'
+				'grub-xen-git: GRUB and pvgrub2 bootloader support')
+
+	if [ "${_build_qemu}" == "false" ]; then
+		optdepends+=("qemu: HVM and PV support")
+	fi
 
 	install="xen.install"
 
@@ -161,7 +167,6 @@ package_xen() {
 			"etc/conf.d/xendomains"
 			"etc/xen/efi-xen.cfg"
 			"etc/xen/cpupool"
-			"etc/xen/grub.conf"
 			"etc/xen/xl.conf"
 	)
 
@@ -199,8 +204,6 @@ package_xen() {
 	rm -r "${pkgdir}/etc/init.d"
 
 	# Install files for Arch Linux.
-	install -D -m 0644 "${srcdir}/grub.conf" "${pkgdir}/etc/xen/grub.conf"
-	install -D -m 0755 "${srcdir}/grub-mkconfig-helper" "${pkgdir}/etc/grub.d/09_xen"
 	install -D -m 0644 "${srcdir}/efi-xen.cfg" "${pkgdir}/etc/xen/efi-xen.cfg"
 	install -D -m 0644 "${srcdir}/xen.conf" "${pkgdir}/usr/lib/modules-load.d/xen.conf"
 	install -D -m 0644 "${srcdir}/tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/${pkgbase}.conf"