Update to 4.9 and fixup

- Reformat PKGBUILD - Put all version numbers in the PKGBUILD together - Verify Xen with PGP - Remove obsolete patches - Add XSA 203 - Add XSA 204 - Add debug output while building - Run systemd-tmpfiles after installation - Add gitignore
author: Janne Heß 2017-01-12 18:16:55 +0100
committer: Janne Heß 2017-01-12 23:50:19 +0100
commit: 68c6c51b915780c891fc38ae82fcc8b44fb05a65 (patch)
tree: a0d44078a7929c0774fc616ef8c9f76927c70c4c
parent: 035aa6e93208e6806d6ff0a38dcae88b1baab360 (diff)
download: aur-68c6c51b915780c891fc38ae82fcc8b44fb05a65.tar.gz
14 files changed, 391 insertions, 1237 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9af6833b9498..dc6bb68ce96c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Thu Jan 12 22:49:00 UTC 2017
 pkgbase = xen
 	pkgdesc = Virtual Machine Hypervisor & Tools
-	pkgver = 4.7.0
-	pkgrel = 3
+	pkgver = 4.8.0
+	pkgrel = 1
 	url = http://www.xenproject.org/
 	install = xen.install
 	changelog = ChangeLog
@@ -23,6 +25,7 @@ pkgbase = xen
 	depends = curl
 	depends = gnutls
 	depends = iproute2
+	depends = lib32-glibc
 	depends = libaio
 	depends = libcap-ng
 	depends = libiscsi
@@ -30,15 +33,14 @@ pkgbase = xen
 	depends = libpng
 	depends = lzo2
 	depends = pciutils
-	depends = python
 	depends = python2
 	depends = sdl
 	depends = spice
 	depends = usbredir
 	depends = yajl
-	depends = lib32-glibc
 	optdepends = xen-docs: Official Xen Documentation
 	optdepends = openvswitch: Optional Networking support
+	provides = xen-4.8.0
 	conflicts = xen-4.2
 	conflicts = xen-4.2-testing-hg
 	conflicts = xen-gdbsx
@@ -51,86 +53,46 @@ pkgbase = xen
 	conflicts = xen-4.4
 	conflicts = xen-4.5
 	conflicts = xen-4.6
-	noextract = ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz
+	conflicts = xen-4.7
+	conflicts = xen-4.8
+	noextract = ipxe-git-827dd1bfee67daa683935ce65316f7e0f057fe1c.tar.gz
 	options = !buildflags
 	options = !strip
-	backup = etc/modules-load.d/xen.conf
-	backup = etc/xen/xl.conf
-	backup = etc/conf.d/xenstored
-	backup = etc/conf.d/xenconsoled
-	backup = etc/conf.d/xendomains
 	backup = etc/conf.d/xencommons
+	backup = etc/conf.d/xendomains
+	backup = etc/xen/efi-xen.cfg
+	backup = etc/xen/cpupool
 	backup = etc/xen/grub.conf
-	source = http://bits.xensource.com/oss-xen/release/4.7.0/xen-4.7.0.tar.gz
-	source = http://xenbits.xen.org/xen-extfiles/ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz
-	source = seabios::git://xenbits.xen.org/seabios.git#tag=rel-1.9.2
-	source = ovmf::git://xenbits.xen.org/ovmf.git#tag=52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d
-	source = ati-passthrough.patch
+	backup = etc/xen/oxenstored.conf
+	backup = etc/xen/xl.conf
+	source = http://bits.xensource.com/oss-xen/release/4.8.0/xen-4.8.0.tar.gz
+	source = http://bits.xensource.com/oss-xen/release/4.8.0/xen-4.8.0.tar.gz.sig
+	source = http://xenbits.xen.org/xen-extfiles/ipxe-git-827dd1bfee67daa683935ce65316f7e0f057fe1c.tar.gz
+	source = seabios::git://xenbits.xen.org/seabios.git#tag=rel-1.10.0
+	source = ovmf::git://xenbits.xen.org/ovmf.git#tag=bc54e50e0fe03c570014f363b547426913e92449
 	source = ovmf.patch
 	source = patch-gcc6-ovmf-build.sh.patch
-	source = patch-gcc6-etherboot-nonnull-compare.patch::https://git.ipxe.org/ipxe.git/patch/e2f14c2f8c10674dbbd4f1228d79dc4c9be213b5
-	source = patch-gcc6-etherboot-rm-unused-string-functions.patch
-	source = patch-gcc6-etherboot-nic.c.patch::https://git.ipxe.org/ipxe.git/patch/a5885fbc19c4b60dc1a21624d1a9d1b77a93504e
-	source = patch-gcc6-etherboot-ath.patch::https://git.ipxe.org/ipxe.git/patch/63037bdce4a325e5e1da85ffcdf27b77ac670c01
-	source = patch-gcc6-etherboot-sis190.patch::https://git.ipxe.org/ipxe.git/patch/65b32a0b7000f70a5bb1d33190d40f9b04c93172
-	source = patch-gcc6-etherboot-skge.patch::https://git.ipxe.org/ipxe.git/patch/76ec2a0540b25dbd183b9ce185583a4b24278cf1
-	source = patch-gcc6-etherboot-via-velocity.c.patch
-	source = patch-gcc6-etherboot-via-rhine.c.patch
-	source = patch-gcc6-etherboot-e1000_phy.c.patch
-	source = patch-gcc6-etherboot-igb_phy.c.patch
-	source = patch-gcc6-etherboot-eth_broadcast.patch::https://git.ipxe.org/ipxe.git/patch/1cbb1581f16e235fafc963c906ad02b38d5457bd
-	source = patch-gcc6-etherboot-link-header.patch::https://git.ipxe.org/ipxe.git/patch/6324bd9389521c7e86384591f41eb78a81e9af47
-	source = patch-gcc6-etherboot-ath9k-9287-array.patch
-	source = xen.install
-	source = 09_xen
+	source = https://xenbits.xen.org/xsa/xsa203-4.8.patch
+	source = https://xenbits.xen.org/xsa/xsa204-4.8.patch
+	source = grub-mkconfig-helper
 	source = efi-xen.cfg
 	source = grub.conf
 	source = xen.conf
-	source = tmpfiles.d-xen.conf
-	source = https://xenbits.xen.org/xsa/xsa182-unstable.patch
-	source = https://xenbits.xen.org/xsa/xsa183-unstable.patch
-	source = https://xenbits.xen.org/xsa/xsa184-qemut-master.patch
-	source = https://xenbits.xen.org/xsa/xsa184-qemuu-master.patch
-	source = https://xenbits.xen.org/xsa/xsa185.patch
-	source = https://xenbits.xen.org/xsa/xsa186-0001-x86-emulate-Correct-boundary-interactions-of-emulate.patch
-	source = https://xenbits.xen.org/xsa/xsa186-4.7-0002-hvm-fep-Allow-testing-of-instructions-crossing-the.patch
-	source = https://xenbits.xen.org/xsa/xsa187-4.7-0001-x86-shadow-Avoid-overflowing-sh_ctxt-seg.patch
-	source = https://xenbits.xen.org/xsa/xsa187-4.7-0002-x86-segment-Bounds-check-accesses-to-emulation-ctx.patch
-	sha256sums = be5876144d49729572ae06142e0bb93f1c1f2695578141eff2931995add24623
-	sha256sums = 632ce8c193ccacc3012bd354bdb733a4be126f7c098e111930aa41dad537405c
+	source = tmpfiles.conf
+	sha256sums = 1e15c713ab7ba3bfda8b4a285ed973529364fd1100e6dd5a61f29583dc667b04
+	sha256sums = SKIP
+	sha256sums = 36deacb946c59ad1d6600f6e5b89d6a7a8961e65eb000900e184075920120f49
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = d93c2d5bcdf0c3e4c6e8efb357cb4b9d618209025361f5ccd9d03651a8acd7a3
 	sha256sums = 9cf9232c6e9a2b972cd4e1c7aacac9152bb8676db2b794381e1964c9f452e7de
 	sha256sums = 6403a0478e3cfed91dcad53b5f02e71745c98d18ab53930f87aeff1da8d71d55
-	sha256sums = 17bb27d95c86af8cc5e499b1b0db9b95bba3f45910d55b420f9f1f5452355fab
-	sha256sums = 5d5fe7bf52cbae9da20cfd1fc798699b2355a1af907ebf7f764e227891a759bb
-	sha256sums = 9f34f8ecb9a44c688275b838c83efd233bb817f5e222629eac98e116168d704c
-	sha256sums = cdf7c4a089fe1fe493aafaf669decc3c9e071a0950da77dce526c09088d1c931
-	sha256sums = 32595581467772b9fa0fbb5384c99caefeb2cee3306b94b9bd2722084454f5a2
-	sha256sums = c73d1653b9b1d97ddce717817dc74429cd94c7b22989a08604eaa60df63f75f8
-	sha256sums = 448caed900ada2c030738218f5b82f5e29d9dc2e1beef9ebd49cbeb23734df0d
-	sha256sums = 61b1518c8d41792ec3b36e0fbfc265adb6c9304945a6fa18d6cc5a197e34b94f
-	sha256sums = 577f06e38a9ecbd3576907f2ba1c5040f4f1573fe92912635230702ad157b2e7
-	sha256sums = 80a24e9504d3893e83dc60550ffe364a873aaf3dafb52dcdade13f61f2ec0ee5
-	sha256sums = be05ccd8975af402dcba3a3dc78c173319b2edd636bac11ac11163091453b704
-	sha256sums = cace870b6629003b55d9df9ef24f3445067239b913c006b6e23da511c1a21d78
-	sha256sums = a15d73e0fb51fe3c1cf8b80a5ff17d532444016d14495d90d9e642ec60f320a6
-	sha256sums = c3b5b199c3ed271267d255f34e116258c593d04727ff1fd9199ecd37c1b98fe8
+	sha256sums = 4218fcfff11ec4788462a3ea9dddecb25b9d9fb1beaad17ca0f723b07b6675e4
+	sha256sums = fa2a69682868104b6263655abbfc6b326f76deebdac3273b4b65da6673f5d977
 	sha256sums = 06c9f6140f7ef4ccfc4b1a7d9732a673313e269733180f53afcd9e43bf6c26bb
 	sha256sums = ceaff798a92a7aef1465a0a0b27b1817aedd2c857332b456aaa6dd78dc72438f
 	sha256sums = 3f0af16958c3e057b9baa5afc47050d9adf7dd553274dd97ae4f35938fefb568
 	sha256sums = 50a9b7fd19e8beb1dea09755f07318f36be0b7ec53d3c9e74f3266a63e682c0c
 	sha256sums = 40e0760810a49f925f2ae9f986940b40eba477dc6d3e83a78baaae096513b3cf
-	sha256sums = 303400b9a832a3c1d423cc2cc97c2f00482793722f9ef7dd246783a049ac2792
-	sha256sums = ea0ea4b294332814330f222e6d78eea3b19c394eac8ae22feb4a5bd21e90331f
-	sha256sums = ea41a25dac82cc5c0ef8e599feb6ed400e99414110d4dba8017d6bd048bc3de4
-	sha256sums = 2d675e5e08d9443cf2e5f3aa37521241d6ed898a602b5111d6969023e67b9b6b
-	sha256sums = 3328a1953ecdf4de35462ea8396b0927171d718e95f73a87a7f651427bd8f8b4
-	sha256sums = f2082a36d968a47e477bb5082d0e0aaa58e6cb3dc20b26389f043a9b7b595fa6
-	sha256sums = 5a826a32763d82ac83c924f8c89d12aae5f069a4cbc7d5193aa8413a02b6dc05
-	sha256sums = be9fe85d36c2c1fbca246c1f4d834c3ef11b6ab3d5467da0ac8c079aa5a68de9
-	sha256sums = 36b22d6a168be39f31a1c1304f708269a2a10fe5105f7da4a06877d6059f1cd6
 
 pkgname = xen
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..d068b4f7b690
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,11 @@
+/pkg/
+/src/
+/ovmf/
+/seabios/
+/xsa*
+
+*.tar
+*.gz
+*.tgz
+*.bz2
+*.sig
diff --git a/ChangeLog b/ChangeLog
index 9f029be5641b..92bc5c644725 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-01-12 Janne Heß
+	* 4.8.0-4
+	Xen 4.8.0
+	Update all downloaded packages
+	Remove all obsolete patches
+	Apply XSA patch: 203, 204
+
 2016-09-18 John Thomson
 	* 4.7.0-3
 	Apply XSA patch: 185, 186, 187
diff --git a/PKGBUILD b/PKGBUILD
index 1f9ef17b2cbf..dbe61da2c846 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,376 +1,361 @@
-# Maintainer: Arthur Borsboom <arthurborsboom@gmail.com>
+# Maintainer:  Janne Heß <jannehess@gmail.com>
+# Contributor: Arthur Borsboom <arthurborsboom@gmail.com>
 # Contributor: Shanmu Thiagaraja <sthiagaraja+AUR@prshanmu.com>
 # Contributor: Limao Luo
 # Contributor: Luceo
 # Contributor: Revellion
 # Contributor: John Thomson
 
-#linux-4.7 EFI boot panic issue (patch linux)
+# linux-4.7 EFI boot panic issue (patch linux)
 #http://lkml.iu.edu/hypermail/linux/kernel/1608.2/03448.html
 
+#####
+# Settings
+#####
+
 _build_stubdom=${build_stubdom:-false}
-## use _build_stubdom=true to build xen with stubdom
-#_build_stubdom=true
+# use _build_stubdom=true to build xen with stubdom
+
+#####
+# Versions
+#####
+
+_xen_version='4.8.0'
+_xen_major_version='4'
+# grep -R 'UPSTREAM_REVISION' src/xen-*/Config.mk
+_git_tag_seabios='#tag=rel-1.10.0'
+_git_tag_ovmf='#tag=bc54e50e0fe03c570014f363b547426913e92449'
+# grep IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot
+_git_tag_ipxe='827dd1bfee67daa683935ce65316f7e0f057fe1c'
+# grep '_VERSION=' src/xen-*/stubdom/configure
+if [ "${_build_stubdom}" = true ]; then
+	_zlib_version='1.2.3'
+	_libpci_version='2.2.9'
+	_newlib_version='1.16.0'
+	_lwip_version='1.3.0'
+	_grub_version='0.97'
+	_ocaml_version='3.11.0'
+	_ocaml_short_version='3.11'
+	_gmp_version='4.3.2'
+	_polarssl_version='1.1.4'
+	_tpmemu_version='0.7.4'
+fi
+
+#####
+# Package metadata
+#####
 
 pkgname=xen
-pkgver=4.7.0
-pkgrel=3
-pkgdesc="Virtual Machine Hypervisor & Tools"
-arch=(x86_64)
-url="http://www.xenproject.org/"
-license=(GPL2)
-depends=(bridge-utils curl gnutls iproute2 libaio libcap-ng libiscsi libnl libpng lzo2 pciutils python python2 sdl spice usbredir yajl
-        # seabios ovmf qemu
-        )
-[[ "$CARCH" == "x86_64" ]] && depends+=(lib32-glibc)
-makedepends=(bin86 cmake dev86 figlet git iasl markdown nasm ocaml-findlib spice-protocol wget)
-
-## For building Xen EFI boot file.
-## mingw-w64-binutils only needed if 
-## binutils not built with --enable-targets=x86_64-pep 
-_binutils_emulations=$(ld -V)
+pkgver="${_xen_version}"
+pkgrel=1
+pkgdesc='Virtual Machine Hypervisor & Tools'
+url='http://www.xenproject.org/'
+license=('GPL2')
+install="${pkgname}.install"
+changelog='ChangeLog'
+validpgpkeys=('23E3222C145F4475FA8060A783FE14C957E82BD9') # Xen.org Xen tree code signing
+arch=('x86_64') # TODO What about ARM?
+conflicts=(xen-4.2{,-testing-hg} xen-{gdbsx,hg-unstable,rc,git,igvtg} xen-4.3{,-testing-hg} xen-4.{4..8})
+provides=("xen-${pkgver}")
+options=(!buildflags !strip)
+# Dependencies
+depends=(
+	bridge-utils
+	curl
+	gnutls
+	iproute2
+	lib32-glibc
+	libaio
+	libcap-ng
+	libiscsi
+	libnl
+	libpng
+	lzo2
+	pciutils
+	python2
+	sdl
+	spice
+	usbredir
+	yajl
+	# TODO why not use system's seabios, ovmf, qemu
+)
+makedepends=(
+	bin86
+	cmake
+	dev86
+	figlet
+	git
+	iasl
+	markdown
+	nasm
+	ocaml-findlib
+	spice-protocol
+	wget
+)
+
+# For building Xen EFI boot file.
+# mingw-w64-binutils only needed if
+# binutils not built with --enable-targets=x86_64-pep
 _binutils_efi=false
-if [[ $_binutils_emulations == *'i386pep'* ]]
-then
-    _binutils_efi=true
-    echo 'ld has efi support'
+if [ "$(ld -V)" = *'i386pep'* ]; then
+	_binutils_efi=true
 else
-    makedepends+=(mingw-w64-binutils)
-    echo 'ld does not have efi support, using mingw'
+	makedepends+=(mingw-w64-binutils)
 fi
 
-optdepends=('xen-docs: Official Xen Documentation' 'openvswitch: Optional Networking support')
-conflicts=(xen-4.2{,-testing-hg} xen-{gdbsx,hg-unstable,rc,git,igvtg} xen-4.3{,-testing-hg} xen-4.4 xen-4.5 xen-4.6)
+optdepends=(
+	'xen-docs: Official Xen Documentation'
+	'openvswitch: Optional Networking support'
+)
 backup=(
-        etc/modules-load.d/$pkgname.conf
-        etc/$pkgname/xl.conf
-        etc/conf.d/xen{stored,consoled,domains,commons}
-        etc/$pkgname/grub.conf
-        )
-options=(!buildflags !strip)
-install=$pkgname.install
-changelog=ChangeLog
+	etc/conf.d/xen{commons,domains}
+	"etc/${pkgname}/efi-xen.cfg"
+	"etc/${pkgname}/cpupool"
+	"etc/${pkgname}/grub.conf"
+	"etc/${pkgname}/oxenstored.conf"
+	"etc/${pkgname}/xl.conf"
+)
 
-##SeaBIOS & OVMF tags are in src/xen-*/tools/Config.mk
-##grep -R 'UPSTREAM_REVISION' src/xen-*/Config.mk
-_git_tag_seabios='#tag=rel-1.9.2'
-_git_tag_ovmf='#tag=52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d'
 
+# Sources
 source=(
-    http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.gz
-    http://xenbits.xen.org/xen-extfiles/ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz
-
-    'seabios'::"git://xenbits.xen.org/seabios.git${_git_tag_seabios}"
-    'ovmf'::"git://xenbits.xen.org/ovmf.git${_git_tag_ovmf}"
-    ##HTTP access
-    #'seabios'::"git+http://xenbits.xen.org/git-http/seabios.git${_git_tag_seabios}"
-
-    ## Compile patches
-    ati-passthrough.patch
-    ovmf.patch
-    #patch-build-efi-with-mingw.patch::https://github.com/jakogut/xen-igvtg-aur/raw/28c81072e419d72a100ada9c393e37fae35ad263/xen_efi_build.patch
-    patch-gcc6-ovmf-build.sh.patch
-    #ipxe
-    patch-gcc6-etherboot-nonnull-compare.patch::https://git.ipxe.org/ipxe.git/patch/e2f14c2f8c10674dbbd4f1228d79dc4c9be213b5
-    patch-gcc6-etherboot-rm-unused-string-functions.patch
-    patch-gcc6-etherboot-nic.c.patch::https://git.ipxe.org/ipxe.git/patch/a5885fbc19c4b60dc1a21624d1a9d1b77a93504e
-    patch-gcc6-etherboot-ath.patch::https://git.ipxe.org/ipxe.git/patch/63037bdce4a325e5e1da85ffcdf27b77ac670c01
-    patch-gcc6-etherboot-sis190.patch::https://git.ipxe.org/ipxe.git/patch/65b32a0b7000f70a5bb1d33190d40f9b04c93172
-    patch-gcc6-etherboot-skge.patch::https://git.ipxe.org/ipxe.git/patch/76ec2a0540b25dbd183b9ce185583a4b24278cf1
-    patch-gcc6-etherboot-via-velocity.c.patch
-    patch-gcc6-etherboot-via-rhine.c.patch
-    patch-gcc6-etherboot-e1000_phy.c.patch
-    patch-gcc6-etherboot-igb_phy.c.patch
-    patch-gcc6-etherboot-eth_broadcast.patch::https://git.ipxe.org/ipxe.git/patch/1cbb1581f16e235fafc963c906ad02b38d5457bd
-    patch-gcc6-etherboot-link-header.patch::https://git.ipxe.org/ipxe.git/patch/6324bd9389521c7e86384591f41eb78a81e9af47
-    patch-gcc6-etherboot-ath9k-9287-array.patch
-
-    ## Files
-    xen.install
-    09_xen
-    efi-xen.cfg
-    grub.conf
-    $pkgname.conf
-    tmpfiles.d-$pkgname.conf
-
-    ## XSA patches
-    https://xenbits.xen.org/xsa/xsa182-unstable.patch
-    https://xenbits.xen.org/xsa/xsa183-unstable.patch
-    https://xenbits.xen.org/xsa/xsa184-qemut-master.patch
-    https://xenbits.xen.org/xsa/xsa184-qemuu-master.patch
-    https://xenbits.xen.org/xsa/xsa185.patch
-    https://xenbits.xen.org/xsa/xsa186-0001-x86-emulate-Correct-boundary-interactions-of-emulate.patch
-    https://xenbits.xen.org/xsa/xsa186-4.7-0002-hvm-fep-Allow-testing-of-instructions-crossing-the.patch
-    https://xenbits.xen.org/xsa/xsa187-4.7-0001-x86-shadow-Avoid-overflowing-sh_ctxt-seg.patch
-    https://xenbits.xen.org/xsa/xsa187-4.7-0002-x86-segment-Bounds-check-accesses-to-emulation-ctx.patch
-    )
-
-if [ "$_build_stubdom" = true ] ; then
-    echo "building with stubdom"
-    source+=(
-        http://xenbits.xen.org/xen-extfiles/lwip-1.3.0.tar.gz
-        http://xenbits.xen.org/xen-extfiles/zlib-1.2.3.tar.gz
-        http://xenbits.xen.org/xen-extfiles/newlib-1.16.0.tar.gz
-        http://xenbits.xen.org/xen-extfiles/pciutils-2.2.9.tar.bz2
-        http://xenbits.xen.org/xen-extfiles/polarssl-1.1.4-gpl.tgz
-        http://xenbits.xen.org/xen-extfiles/grub-0.97.tar.gz
-        http://xenbits.xen.org/xen-extfiles/tpm_emulator-0.7.4.tar.gz
-        http://xenbits.xen.org/xen-extfiles/gmp-4.3.2.tar.bz2
-        #http://caml.inria.fr/pub/distrib/ocaml-3.11/ocaml-3.11.0.tar.gz
-    )
+	"http://bits.xensource.com/oss-xen/release/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+	"http://bits.xensource.com/oss-xen/release/${pkgver}/${pkgname}-${pkgver}.tar.gz.sig"
+	"http://xenbits.xen.org/xen-extfiles/ipxe-git-${_git_tag_ipxe}.tar.gz"
+
+	'seabios'::"git://xenbits.xen.org/seabios.git${_git_tag_seabios}"
+	'ovmf'::"git://xenbits.xen.org/ovmf.git${_git_tag_ovmf}"
+	# HTTP access
+	#'seabios'::"git+http://xenbits.xen.org/git-http/seabios.git${_git_tag_seabios}"
+
+	# Compile patches
+	ovmf.patch
+	patch-gcc6-ovmf-build.sh.patch
+
+	# XSA patches
+	'https://xenbits.xen.org/xsa/xsa203-4.8.patch'
+	'https://xenbits.xen.org/xsa/xsa204-4.8.patch'
+
+	# Files
+	'grub-mkconfig-helper'
+	'efi-xen.cfg'
+	'grub.conf'
+	"${pkgname}.conf"
+	'tmpfiles.conf'
+)
+
+if [ "${_build_stubdom}" = true ] ; then
+	source+=(
+		"http://xenbits.xen.org/xen-extfiles/zlib-${_zlib_version}.tar.gz"
+		"http://xenbits.xen.org/xen-extfiles/pciutils-${_libpci_version}.tar.bz2"
+		"http://xenbits.xen.org/xen-extfiles/newlib-${_newlib_version}.tar.gz"
+		"http://xenbits.xen.org/xen-extfiles/lwip-${_lwip_version}.tar.gz"
+		"http://xenbits.xen.org/xen-extfiles/grub-${_grub_version}.tar.gz"
+		"http://caml.inria.fr/pub/distrib/ocaml-${_ocaml_short_version}/ocaml-${_ocaml_version}.tar.gz"
+		"http://xenbits.xen.org/xen-extfiles/gmp-${_gmp_version}.tar.bz2"
+		"http://xenbits.xen.org/xen-extfiles/polarssl-${_polarssl_version}-gpl.tgz"
+		"http://xenbits.xen.org/xen-extfiles/tpm_emulator-${_tpmemu_version}.tar.gz"
+	)
 fi
 
+sha256sums=(
+	'1e15c713ab7ba3bfda8b4a285ed973529364fd1100e6dd5a61f29583dc667b04'
+	'SKIP'
+	'36deacb946c59ad1d6600f6e5b89d6a7a8961e65eb000900e184075920120f49'
+
+	'SKIP'
+	'SKIP'
+
+	'9cf9232c6e9a2b972cd4e1c7aacac9152bb8676db2b794381e1964c9f452e7de'
+	'6403a0478e3cfed91dcad53b5f02e71745c98d18ab53930f87aeff1da8d71d55'
+	# XSA patches
+	'4218fcfff11ec4788462a3ea9dddecb25b9d9fb1beaad17ca0f723b07b6675e4'
+	'fa2a69682868104b6263655abbfc6b326f76deebdac3273b4b65da6673f5d977'
+	# PKGBUILD files
+	'06c9f6140f7ef4ccfc4b1a7d9732a673313e269733180f53afcd9e43bf6c26bb'
+	'ceaff798a92a7aef1465a0a0b27b1817aedd2c857332b456aaa6dd78dc72438f'
+	'3f0af16958c3e057b9baa5afc47050d9adf7dd553274dd97ae4f35938fefb568'
+	'50a9b7fd19e8beb1dea09755f07318f36be0b7ec53d3c9e74f3266a63e682c0c'
+	'40e0760810a49f925f2ae9f986940b40eba477dc6d3e83a78baaae096513b3cf'
+)
 
-noextract=(
-    ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz
-    )
 
 if [ "$_build_stubdom" = true ] ; then
-    noextract+=(
-        lwip-1.3.0.tar.gz
-        zlib-1.2.3.tar.gz
-        newlib-1.16.0.tar.gz
-        pciutils-2.2.9.tar.bz2
-        polarssl-1.1.4-gpl.tgz
-        grub-0.97.tar.gz
-        tpm_emulator-0.7.4.tar.gz
-        gmp-4.3.2.tar.bz2
-        #ocaml-3.11.0.tar.gz
-    )
+	sha256sums+=(
+		'1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e'
+		'f60ae61cfbd5da1d849d0beaa21f593c38dac9359f0b3ddc612f447408265b24'
+		'db426394965c48c1d29023e1cc6d965ea6b9a9035d8a849be2750ca4659a3d07'
+		'772e4d550e07826665ed0528c071dd5404ef7dbe1825a38c8adbc2a00bca948f'
+		'4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b'
+		'ecdd4f8473ab0dee5d3acb5c0a31a4c1dd6aa12179895cf1903dd0f455c43a4f'
+		'936162c0312886c21581002b79932829aa048cfaf9937c6265aeaa14f1cd1775'
+		'2d29fd04a0d0ba29dae6bd29fb418944c08d3916665dcca74afb297ef37584b6'
+		'4e48ea0d83dd9441cc1af04ab18cd6c961b9fa54d5cbf2c2feee038988dea459'
+	)
 fi
 
-sha256sums=(
-            'be5876144d49729572ae06142e0bb93f1c1f2695578141eff2931995add24623'
-            '632ce8c193ccacc3012bd354bdb733a4be126f7c098e111930aa41dad537405c'
-
-            'SKIP'
-            'SKIP'
-
-            'd93c2d5bcdf0c3e4c6e8efb357cb4b9d618209025361f5ccd9d03651a8acd7a3'
-            '9cf9232c6e9a2b972cd4e1c7aacac9152bb8676db2b794381e1964c9f452e7de'
-            #'a8ce42777e22af49080131e174b6b89c6e7597539838fb8b17a12280fd10b10b'
-            '6403a0478e3cfed91dcad53b5f02e71745c98d18ab53930f87aeff1da8d71d55'
-            #ipxe
-            '17bb27d95c86af8cc5e499b1b0db9b95bba3f45910d55b420f9f1f5452355fab'
-            '5d5fe7bf52cbae9da20cfd1fc798699b2355a1af907ebf7f764e227891a759bb'
-            '9f34f8ecb9a44c688275b838c83efd233bb817f5e222629eac98e116168d704c'
-            'cdf7c4a089fe1fe493aafaf669decc3c9e071a0950da77dce526c09088d1c931'
-            '32595581467772b9fa0fbb5384c99caefeb2cee3306b94b9bd2722084454f5a2'
-            'c73d1653b9b1d97ddce717817dc74429cd94c7b22989a08604eaa60df63f75f8'
-            '448caed900ada2c030738218f5b82f5e29d9dc2e1beef9ebd49cbeb23734df0d'
-            '61b1518c8d41792ec3b36e0fbfc265adb6c9304945a6fa18d6cc5a197e34b94f'
-            '577f06e38a9ecbd3576907f2ba1c5040f4f1573fe92912635230702ad157b2e7'
-            '80a24e9504d3893e83dc60550ffe364a873aaf3dafb52dcdade13f61f2ec0ee5'
-            'be05ccd8975af402dcba3a3dc78c173319b2edd636bac11ac11163091453b704'
-            'cace870b6629003b55d9df9ef24f3445067239b913c006b6e23da511c1a21d78'
-            'a15d73e0fb51fe3c1cf8b80a5ff17d532444016d14495d90d9e642ec60f320a6'
-            #pkgbuild files
-            'c3b5b199c3ed271267d255f34e116258c593d04727ff1fd9199ecd37c1b98fe8'
-            '06c9f6140f7ef4ccfc4b1a7d9732a673313e269733180f53afcd9e43bf6c26bb'
-            'ceaff798a92a7aef1465a0a0b27b1817aedd2c857332b456aaa6dd78dc72438f'
-            '3f0af16958c3e057b9baa5afc47050d9adf7dd553274dd97ae4f35938fefb568'
-            '50a9b7fd19e8beb1dea09755f07318f36be0b7ec53d3c9e74f3266a63e682c0c'
-            '40e0760810a49f925f2ae9f986940b40eba477dc6d3e83a78baaae096513b3cf'
-
-            ## XSA patches
-            '303400b9a832a3c1d423cc2cc97c2f00482793722f9ef7dd246783a049ac2792'
-            'ea0ea4b294332814330f222e6d78eea3b19c394eac8ae22feb4a5bd21e90331f'
-            'ea41a25dac82cc5c0ef8e599feb6ed400e99414110d4dba8017d6bd048bc3de4'
-            '2d675e5e08d9443cf2e5f3aa37521241d6ed898a602b5111d6969023e67b9b6b'
-            '3328a1953ecdf4de35462ea8396b0927171d718e95f73a87a7f651427bd8f8b4'
-            'f2082a36d968a47e477bb5082d0e0aaa58e6cb3dc20b26389f043a9b7b595fa6'
-            '5a826a32763d82ac83c924f8c89d12aae5f069a4cbc7d5193aa8413a02b6dc05'
-            'be9fe85d36c2c1fbca246c1f4d834c3ef11b6ab3d5467da0ac8c079aa5a68de9'
-            '36b22d6a168be39f31a1c1304f708269a2a10fe5105f7da4a06877d6059f1cd6'
-	    )
-
+noextract=(
+	"ipxe-git-${_git_tag_ipxe}.tar.gz"
+)
 
 if [ "$_build_stubdom" = true ] ; then
-    sha256sums+=(
-            #stubdom bits
-            '772e4d550e07826665ed0528c071dd5404ef7dbe1825a38c8adbc2a00bca948f'
-            '1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e'
-            'db426394965c48c1d29023e1cc6d965ea6b9a9035d8a849be2750ca4659a3d07'
-            'f60ae61cfbd5da1d849d0beaa21f593c38dac9359f0b3ddc612f447408265b24'
-            '2d29fd04a0d0ba29dae6bd29fb418944c08d3916665dcca74afb297ef37584b6'
-            '4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b'
-            '4e48ea0d83dd9441cc1af04ab18cd6c961b9fa54d5cbf2c2feee038988dea459'
-            '936162c0312886c21581002b79932829aa048cfaf9937c6265aeaa14f1cd1775'
-            #'ecdd4f8473ab0dee5d3acb5c0a31a4c1dd6aa12179895cf1903dd0f455c43a4f'
-
-            #stubdom patches
-            )
+	noextract+=(
+		"zlib-${_zlib_version}.tar.gz"
+		"pciutils-${_libci_version}.tar.bz2"
+		"newlib-${_newlib_version}.tar.gz"
+		"lwip-${_lwip_version}.tar.gz"
+		"grub-${_grub_version}.tar.gz"
+		"ocaml-${_ocaml_version}.tar.gz"
+		"gmp-${_gmp_version}.tar.bz2"
+		"polarssl-${_polarssl_version}-gpl.tgz"
+		"tpm_emulator-${_tpmemu_version}.tar.gz"
+	)
 fi
 
 prepare() {
-    cd "$pkgname-$pkgver/"
-
-    ### Copy git sourced tools/firmware
-    # Copy seabios into place
-    mkdir tools/firmware/seabios-dir-remote/
-    cp -r ../seabios/* tools/firmware/seabios-dir-remote/
-    # Copy ovmf into place
-    mkdir tools/firmware/ovmf-dir-remote/
-    cp -r ../ovmf/* tools/firmware/ovmf-dir-remote/
-
-    ### Patching
-
-    # XSA Patches
-    echo 'XSA patches'
-    # Security Patches - Base
-    patch -Np1 -i "$srcdir/xsa182-unstable.patch"
-    patch -Np1 -i "$srcdir/xsa183-unstable.patch"
-    patch -Np1 -i "$srcdir/xsa185.patch"
-    patch -Np1 -i "$srcdir/xsa186-0001-x86-emulate-Correct-boundary-interactions-of-emulate.patch"
-    patch -Np1 -i "$srcdir/xsa186-4.7-0002-hvm-fep-Allow-testing-of-instructions-crossing-the.patch"
-    patch -Np1 -i "$srcdir/xsa187-4.7-0001-x86-shadow-Avoid-overflowing-sh_ctxt-seg.patch"
-    patch -Np1 -i "$srcdir/xsa187-4.7-0002-x86-segment-Bounds-check-accesses-to-emulation-ctx.patch"
-
-    # Security Patches - qemu-xen-traditional
-    cd 'tools/qemu-xen-traditional/'
-    patch -Np1 -i "$srcdir/xsa184-qemut-master.patch"
-    cd '../../'
-
-    # Security Patches - qemu-xen (upstream)
-    cd 'tools/qemu-xen/'
-    patch -Np1 -i "$srcdir/xsa184-qemuu-master.patch"
-    cd '../../'
-
-
-    # Compile Patches
-    echo 'Compile patches'
-
-    # Build EFI binary with mingw
-    if [ $_binutils_efi != true ]
-    then
-        #patch -Np1 -i "$srcdir/patch-build-efi-with-mingw.patch"
-        sed -i.bak '/ EFI_LD/s/LD/LD_EFI/' xen/arch/x86/Makefile
-        sed -i.bak 's/LD/LD_EFI/' xen/arch/x86/efi/Makefile
-        sed -i.bak '/EFI_MOUNTPOINT .*/aLD_EFI ?= $(LD)' xen/Makefile
-    fi
-
-    # OVMF Compile support (Pulls from GIT repo, so patching to patch after pull request)
-    patch -Np1 -i "$srcdir/ovmf.patch"
-    cp "$srcdir/patch-gcc6-ovmf-build.sh.patch" tools/firmware/
-
-    # Uncomment line below if you want to enable ATI Passthrough support (some reported successes, untested with 4.4)
-    #patch -Np1 -i "$srcdir/ati-passthrough.patch"
-
-    ## GCC-6
-    #etherboot
-    echo -e "patch-gcc6-etherboot-nonnull-compare.patch\npatch-gcc6-etherboot-rm-unused-string-functions.patch\npatch-gcc6-etherboot-nic.c.patch\npatch-gcc6-etherboot-ath.patch\npatch-gcc6-etherboot-sis190.patch\npatch-gcc6-etherboot-skge.patch\npatch-gcc6-etherboot-via-velocity.c.patch\npatch-gcc6-etherboot-via-rhine.c.patch\npatch-gcc6-etherboot-e1000_phy.c.patch\npatch-gcc6-etherboot-igb_phy.c.patch\npatch-gcc6-etherboot-link-header.patch\npatch-gcc6-etherboot-eth_broadcast.patch\npatch-gcc6-etherboot-ath9k-9287-array.patch" >> tools/firmware/etherboot/patches/series
-    cp ${srcdir}/patch-gcc6-etherboot-*.patch tools/firmware/etherboot/patches/
-
-    ## Fix Install Paths
-    sed -i 's:\$localstatedir/run/xen:/run/xen:' m4/paths.m4
-    sed -i 's:/var/run:/run:' tools/ocaml/xenstored/define.ml
-    sed -i 's:/var/run:/run:' tools/ocaml/xenstored/systemd_stubs.c
-
-    if [ "$_build_stubdom" = true ] ; then
-        # Copy supporting tarballs into place
-        cp "$srcdir/lwip-1.3.0.tar.gz" stubdom/
-        cp "$srcdir/zlib-1.2.3.tar.gz" stubdom/
-        cp "$srcdir/newlib-1.16.0.tar.gz" stubdom/
-        cp "$srcdir/pciutils-2.2.9.tar.bz2" stubdom/
-        cp "$srcdir/polarssl-1.1.4-gpl.tgz" stubdom/
-        cp "$srcdir/grub-0.97.tar.gz" stubdom/
-        cp "$srcdir/tpm_emulator-0.7.4.tar.gz" stubdom/
-        cp "$srcdir/gmp-4.3.2.tar.bz2" stubdom/
-        #cp "$srcdir/ocaml-3.11.0.tar.gz" stubdom/
-
-        ## Stubdom patches
-        cd 'extras/mini-os'
-        cd '../../'
-
-    fi
-
-    #etherboot
-    cp "$srcdir/ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz" tools/firmware/etherboot/ipxe.tar.gz
-
-    #Workaround for cannot compute sizeof (unsigned short) 
-    #Makefile:170: recipe for target 'gmp-x86_64' failed
-    #Probably not safe!
-    #sed -i.bak "/< gmp.patch/a\	sed -i.bak 's/\\\\(\\\\s*\\\\)\\\\(fprintf (f,\\\\)\\\\(.*\\\\)/\\\\1\\\\2\\\\3\\\\n\\\\1clearerr(f);/' \$@/configure" stubdom/Makefile
-
-
+	cd "${pkgname}-${pkgver}/"
+
+	msg2 'Copying downloaded files...'
+	mkdir -p tools/firmware/{seabios,ovmf}-dir-remote/ tools/firmware/etherboot
+	cp -r ../seabios/* tools/firmware/seabios-dir-remote/
+	cp -r ../ovmf/* tools/firmware/ovmf-dir-remote/
+	cp "${srcdir}/ipxe-git-${_git_tag_ipxe}.tar.gz" tools/firmware/etherboot/ipxe.tar.gz
+
+	# XSA Patches
+	msg2 'Applying XSA Patches...'
+	patch -Np1 -i "${srcdir}/xsa203-4.8.patch"
+	patch -Np1 -i "${srcdir}/xsa204-4.8.patch"
+
+	# Patch EFI binary build with mingw
+	if [ "${_binutils_efi}" != true ]; then
+		msg2 'Patching EFI build...'
+		sed -i.bak '/ EFI_LD/s/LD/LD_EFI/' xen/arch/x86/Makefile
+		sed -i.bak 's/LD/LD_EFI/' xen/arch/x86/efi/Makefile
+		sed -i.bak '/EFI_MOUNTPOINT .*/aLD_EFI ?= $(LD)' xen/Makefile
+	fi
+
+	# OVMF Compile support (Pulls from git repo, so patching to patch after pull request)
+	msg2 'Patching OVMF Python version...'
+	patch -Np1 -i "${srcdir}/ovmf.patch"
+	cp "${srcdir}/patch-gcc6-ovmf-build.sh.patch" tools/firmware/
+
+	# Fix Install Paths
+	msg2 'Fixing installation paths...'
+	sed -i 's:\$localstatedir/run/xen:/run/xen:' m4/paths.m4
+	sed -i 's:/var/run:/run:' tools/ocaml/xenstored/define.ml
+	sed -i 's:/var/run:/run:' tools/ocaml/xenstored/systemd_stubs.c
+
+	if [ "${_build_stubdom}" = true ] ; then
+		msg2 'Copying stubdom files...'
+		# Copy supporting tarballs into place
+		cp "${srcdir}/zlib-${_zlib_version}.tar.gz" stubdom/
+		cp "${srcdir}/pciutils-${_libpci_version}.tar.bz2" stubdom/
+		cp "${srcdir}/newlib-${_newlib_version}.tar.gz" stubdom/
+		cp "${srcdir}/lwip-${_lwip_version}.tar.gz" stubdom/
+		cp "${srcdir}/grub-${_grub_version}.tar.gz" stubdom/
+		cp "${srcdir}/ocaml-${_ocaml_version}.tar.gz" stubdom/
+		cp "${srcdir}/gmp-${_gmp_version}.tar.bz2" stubdom/
+		cp "${srcdir}/polarssl-${_polarssl_version}-gpl.tgz" stubdom/
+		cp "${srcdir}/tpm_emulator-${_tpmemu_version}.tar.gz" stubdom/
+	fi
+
+	# Workaround for cannot compute sizeof (unsigned short) 
+	# Makefile:170: recipe for target 'gmp-x86_64' failed
+	# Probably not safe!
+	#sed -i.bak "/< gmp.patch/a\	sed -i.bak 's/\\\\(\\\\s*\\\\)\\\\(fprintf (f,\\\\)\\\\(.*\\\\)/\\\\1\\\\2\\\\3\\\\n\\\\1clearerr(f);/' \$@/configure" stubdom/Makefile
 }
 
 build() {
-    cd "$pkgname-$pkgver/"
-    export LD_EFI="/usr/x86_64-w64-mingw32/bin/ld"
-    ./autogen.sh
-    if [ "$_build_stubdom" = true ] ; then
-        _config_stubdom='--enable-stubdom'
-    fi
-    ./configure PYTHON=/usr/bin/python2 --prefix=/usr --sbindir=/usr/bin --with-sysconfig-leaf-dir=conf.d --with-initddir=/etc/init.d \
-        --enable-systemd --disable-docs --enable-ovmf \
-        "${_config_stubdom:---disable-stubdom}" \
-        --with-extra-qemuu-configure-args="--disable-bluez --disable-gtk --enable-spice --enable-usb-redir"
-        #--with-system-qemu --with-system-seabios --with-system-ovmf 
-        #defaults --enable-qemu-traditional --enable-rombios \
-    make LANG=C PYTHON=python2 dist-misc
-    make LANG=C PYTHON=python2 dist-xen
-    make LANG=C PYTHON=python2 dist-tools
-    if [ "$_build_stubdom" = true ] ; then
-        make LANG=C PYTHON=python2 dist-stubdom
-    fi
+	cd "${pkgname}-${pkgver}/"
+	export LD_EFI='/usr/x86_64-w64-mingw32/bin/ld'
+	if [ "${_build_stubdom}" = true ] ; then
+		local _config_stubdom='--enable-stubdom'
+	fi
+
+	msg2 'Configuring...'
+	./autogen.sh
+	./configure \
+		PYTHON=/usr/bin/python2 \
+		--prefix=/usr \
+		--sbindir=/usr/bin \
+		--with-sysconfig-leaf-dir=conf.d \
+		--with-initddir=/etc/init.d \
+		--enable-systemd \
+		--disable-docs \
+		--enable-ovmf \
+		"${_config_stubdom:---disable-stubdom}" \
+		--with-extra-qemuu-configure-args="--disable-bluez --disable-gtk --enable-spice --enable-usb-redir"
+		#--with-system-qemu --with-system-seabios --with-system-ovmf 
+		#defaults --enable-qemu-traditional --enable-rombios \
+
+	msg2 'Building Xen (1/3)...'
+	make LANG=C PYTHON=python2 dist-misc
+	msg2 'Building Xen (2/3)...'
+	make LANG=C PYTHON=python2 dist-xen
+	msg2 'Building Xen (3/3)...'
+	make LANG=C PYTHON=python2 dist-tools
+	if [ "$_build_stubdom" = true ] ; then
+		msg2 'Building Stubdom...'
+		make LANG=C PYTHON=python2 dist-stubdom
+	fi
 }
 
 package() {
-    cd "$pkgname-$pkgver/"
-
-    make DESTDIR="$pkgdir" LANG=C PYTHON=python2 install
-
-    cd "$pkgdir"
-
-    # Install files from AUR package
-    install -Dm644 "$srcdir/tmpfiles.d-$pkgname.conf" usr/lib/tmpfiles.d/$pkgname.conf
-    install -Dm644 "$srcdir/grub.conf" etc/xen/grub.conf
-    install -Dm755 "$srcdir/09_xen" etc/grub.d/09_xen
-    install -Dm644 "$srcdir/efi-xen.cfg" etc/xen/efi-xen.cfg
-
-    # Fix paths in scripts, move to right locations and create missing directories
-    sed -i 's:/var/run:/run:' etc/init.d/xencommons
-    sed -i 's:/var/lock:/run/lock:' etc/xen/scripts/hotplugpath.sh
-    sed -i 's:/var/run:/run:' etc/xen/scripts/locking.sh
-    sed -i 's:/var/run:/run:' usr/lib/systemd/system/xenstored.service
-    sed -i 's:/var/run:/run:' usr/lib/systemd/system/xenstored.socket
-    sed -i 's:/var/run:/run:' usr/lib/systemd/system/xenstored_ro.socket
-
-    mkdir var/log/xen/console
-
-    # Sanitize library path (if lib64 exists)
-    if [[ -d usr/lib64 ]]; then
-        cd usr/
-        cp -r lib64/* lib/
-        rm -rf lib64
-        cd ../
-    fi
-
-    # If EFI binaries build, move to /boot
-    if [[ -f usr/lib/efi/xen.efi ]]; then
-        mv usr/lib/efi/xen-$pkgver.efi boot/xen-$pkgver.efi
-        rm -rf usr/lib/efi
-    fi
-
-    # Compress syms file and move to a share location
-    #gzip boot/$pkgname-syms-*
-    #mv boot/$pkgname-syms-*.gz usr/share/xen
-
-    ##### Kill unwanted stuff #####
-    # hypervisor symlinks
-    rm -f boot/xen{,-4,-4.7,-4.7-rc}.gz
-
-    # Documentation cleanup ( see xen-docs package )
-    rm -rf usr/share/doc
-    rm -rf usr/share/man
-
-    # Unnecessary qemu support files
-#    rm -rf usr/bin/qemu-*-xen
-    rm usr/share/qemu-xen/qemu/{palcode,openbios}-*
-    rm usr/share/xen/qemu/openbios-*
-
-    # adhere to Static Library Packaging Guidelines
-    rm -rf usr/lib/*.a
-
+	cd "${pkgname}-${pkgver}/"
+
+	msg2 'Installing Xen...'
+	make DESTDIR="${pkgdir}" LANG=C PYTHON=python2 install
+
+	cd "${pkgdir}"
+
+	# Install files for Arch
+	msg2 'Installing Arch-specific files...'
+	install -Dm644 "${srcdir}/tmpfiles.conf" "usr/lib/tmpfiles.d/${pkgname}.conf"
+	install -Dm644 "${srcdir}/grub.conf" etc/xen/grub.conf
+	install -Dm755 "${srcdir}/grub-mkconfig-helper" etc/grub.d/09_xen
+	install -Dm644 "${srcdir}/efi-xen.cfg" etc/xen/efi-xen.cfg
+
+	# Fix paths in scripts, move to right locations and create missing directories
+	msg2 'Fixing paths...'
+	sed -i 's:/var/run:/run:' usr/lib/xen/bin/xenpvnetboot
+	sed -i 's:/var/run:/run:' usr/lib/xen/bin/pygrub
+	sed -i 's:/var/run:/run:' usr/bin/xenmon.py
+
+	mkdir -p var/log/xen/console
+
+	# Sanitize library path (if lib64 exists)
+	if [ -d usr/lib64 ]; then
+		msg2 'Sanatizing library paths...'
+		cd usr/
+		mv lib64/* lib/
+		rmdir lib64
+		cd ../
+	fi
+
+	# If EFI binaries build, move to /boot
+	if [ -f usr/lib/efi/xen.efi ]; then
+		msg2 'Moving efi binary...'
+		mv usr/lib/efi/xen*.efi "boot/"
+		rm -rf usr/lib/efi
+	fi
+
+	# Clean up
+	msg2 'Cleaning up...'
+
+	# Hypervisor symlinks
+	rm -f boot/xen{,-${_xen_major_version},-${_xen_version}{,-rc}}.gz
+
+	# Documentation cleanup ( see xen-docs package )
+	rm -rf usr/share/doc
+	rm -rf usr/share/man
+
+	# sysvinit scripts
+	rm -rf etc/init.d
+
+	# Unnecessary qemu support files
+	rm usr/share/qemu-xen/qemu/{palcode,openbios}-*
+	rm usr/share/xen/qemu/openbios-*
+
+	# adhere to Static Library Packaging Guidelines
+	rm -f usr/lib/*.a
 }
diff --git a/ati-passthrough.patch b/ati-passthrough.patch
deleted file mode 100644
index 7c20b1ecd61a..000000000000
--- a/ati-passthrough.patch
+++ /dev/null
@@ -1,415 +0,0 @@
---- xen-4.3.1/tools/qemu-xen-traditional/hw/pass-through.c	Thu Sep  6 11:05:30 2012
-+++ xen-4.3.1-new/tools/qemu-xen-traditional/hw/pass-through.c	Sat Nov 24 08:27:07 2012
-@@ -1438,9 +1438,17 @@ static void pt_ioport_map(PCIDevice *d, 
-     if (e_phys != -1)
-     {
-         /* Create new mapping */
--        ret = xc_domain_ioport_mapping(xc_handle, domid, e_phys,
--                    assigned_device->bases[i].access.pio_base, e_size,
--                    DPCI_ADD_MAPPING);
-+        if ( vga_skip_ioport_map(d) ) 
-+        {
-+            assigned_device->bases[i].e_physbase = -1;
-+        }
-+        else
-+        {
-+            ret = xc_domain_ioport_mapping(xc_handle, domid, e_phys,
-+                   assigned_device->bases[i].access.pio_base, e_size,
-+                   DPCI_ADD_MAPPING);
-+        }
-+
-         if ( ret != 0 )
-         {
-             PT_LOG("Error: create new mapping failed!\n");
---- xen-4.3.1/tools/qemu-xen-traditional/hw/pass-through.h	Thu Sep  6 11:05:30 2012
-+++ xen-4.3.1-new/tools/qemu-xen-traditional/hw/pass-through.h	Sat Nov 24 08:27:07 2012
-@@ -419,6 +419,11 @@ int pt_pci_host_write(struct pci_dev *pc
- void intel_pch_init(PCIBus *bus);
- int register_vga_regions(struct pt_dev *real_device);
- int unregister_vga_regions(struct pt_dev *real_device);
-+int vga_skip_ioport_map(PCIDevice *d);
-+int igd_register_vga_regions(struct pt_dev *real_device);
-+int igd_unregister_vga_regions(struct pt_dev *real_device);
-+int ati_register_vga_regions(struct pt_dev *real_device);
-+int ati_unregister_vga_regions(struct pt_dev *real_device);
- int setup_vga_pt(struct pt_dev *real_device);
- PCIBus *intel_pci_bridge_init(PCIBus *bus, int devfn, uint16_t vid,
-            uint16_t did, const char *name, uint16_t revision);
---- xen-4.3.1/tools/qemu-xen-traditional/hw/pci.h	Thu Sep  6 11:05:30 2012
-+++ xen-4.3.1-new/tools/qemu-xen-traditional/hw/pci.h	Sat Nov 24 08:27:07 2012
-@@ -54,6 +54,8 @@ extern target_phys_addr_t pci_mem_base;
- 
- #define PCI_VENDOR_ID_CIRRUS             0x1013
- 
-+#define PCI_VENDOR_ID_ATI                0x1002
-+
- #define PCI_VENDOR_ID_IBM                0x1014
- #define PCI_DEVICE_ID_IBM_OPENPIC2       0xffff
- 
---- xen-4.3.1/tools/qemu-xen-traditional/hw/pt-graphics.c	Thu Sep  6 11:05:30 2012
-+++ xen-4.3.1-new/tools/qemu-xen-traditional/hw/pt-graphics.c	Sat Nov 24 08:28:10 2012
-@@ -13,6 +13,207 @@
- 
- extern int gfx_passthru;
- extern int igd_passthru;
-+/*********************************/
-+/*   Code for ATI GFX Passthru   */
-+/*********************************/
-+/* ATI VBIOS Working Mechanism 
-+ *
-+ * Generally there are three memory resources (two MMIO and one PIO) 
-+ * associated with modern ATI gfx. VBIOS uses special tricks to figure out 
-+ * BARs, instead of using regular PCI config space read.
-+ *
-+ *  (1) VBIOS relies on I/O port 0x3C3 to retrieve PIO BAR 
-+ *  (2) VBIOS maintains a shadow copy of PCI configure space. It retries the 
-+ *      MMIO BARs from this shadow copy via sending I/O requests to first two 
-+ *      registers of PIO (MMINDEX and MMDATA). The workflow is like this: 
-+ *      MMINDEX (register 0) is written with an index value, specifying the 
-+ *      register VBIOS wanting to access. Then the shadowed data can be 
-+ *      read/written from MMDATA (register 1). For two MMIO BARs, the index 
-+ *      values are 0x4010 and 0x4014 respectively. 
-+ *
-+ */
-+
-+#define ATI_BAR1_INDEX        0  //MMIO BAR1
-+#define ATI_BAR2_INDEX        1  //MMIO BAR2
-+#define ATI_BAR5_INDEX        4  //PIO BAR == BAR5
-+
-+#define ATI_BAR1_MMINDEX      0x4010  //data written to MMINDEX for MMIO BAR1
-+#define ATI_BAR2_MMINDEX      0x4014  //data written to MMINDEX FOR MMIO BAR2
-+
-+struct ati_gfx_info {
-+    int initialized;            /* initialized already? */
-+
-+    /* PIO */
-+    uint32_t host_pio_base;     /* host base addr of PIO */
-+    uint32_t guest_pio_base;    /* guest base addr of PIO */
-+    uint32_t pio_size;          /* PIO size */
-+
-+    /* MMIO */
-+    uint32_t guest_mmio_base1;  /* guest base addr of MMIO 1 */
-+    uint32_t guest_mmio_base2;  /* guest base addr of MMIO 2 */
-+
-+    /* PIO MMINDEX access recording */
-+    uint32_t pre_mmindex_data;       /* previous data written to MMINDEX */
-+};
-+
-+static struct ati_gfx_info gfx_info;
-+
-+/* Convert guest PIO port to host PIO port */
-+static uint16_t gport_to_hport(uint16_t gport)
-+{
-+    return (gport - gfx_info.guest_pio_base) + gfx_info.host_pio_base;
-+}
-+
-+/* Read host PIO port */
-+static uint32_t ati_hw_in(uint16_t hport)
-+{
-+    unsigned val;
-+
-+    //iopl(3);
-+    asm volatile ("in %1,%0":"=a"(val):"Nd"(hport));
-+    //iopl(0);
-+
-+    return val;
-+}
-+
-+/* Write data to host PIO */
-+static void ati_hw_out(uint16_t hport, uint32_t data)
-+{
-+    //iopl(3);
-+    asm volatile ("out %1, %0"::"Nd"(hport),"a"(data));
-+    //iopl(0);
-+}
-+
-+static uint32_t ati_io_regs_read(void *opaque, uint32_t addr)
-+{
-+    uint32_t val;
-+
-+    val = ati_hw_in(gport_to_hport(addr));
-+
-+    /* tweak the value if VBIOS is reading MMIO BAR1 and BAR2 */
-+    if ( addr == (gfx_info.guest_pio_base + 4) )
-+    {
-+        switch ( gfx_info.pre_mmindex_data )
-+        {
-+        case ATI_BAR1_MMINDEX:
-+            val = gfx_info.guest_mmio_base1 | (val & 0x0000000f);
-+            break;
-+        case ATI_BAR2_MMINDEX:
-+            val = gfx_info.guest_mmio_base2 | (val & 0x0000000f);
-+            break;
-+        default:
-+            break;
-+        }
-+    }
-+
-+    return val;
-+}
-+
-+static void ati_io_regs_write(void *opaque, uint32_t addr, uint32_t val)
-+{
-+    ati_hw_out(gport_to_hport(addr), val);
-+
-+    /* book keeping */
-+    if ( addr == gfx_info.guest_pio_base )
-+        gfx_info.pre_mmindex_data = val;
-+}
-+
-+static void ati_gfx_init(struct pt_dev *assigned)
-+{
-+    PCIDevice *dev = (PCIDevice *)&assigned->dev;
-+
-+    register_ioport_read(dev->io_regions[ATI_BAR5_INDEX].addr, 
-+      dev->io_regions[ATI_BAR5_INDEX].size, 4, ati_io_regs_read, assigned);
-+
-+    register_ioport_write(dev->io_regions[ATI_BAR5_INDEX].addr, 
-+      dev->io_regions[ATI_BAR5_INDEX].size, 4, ati_io_regs_write, assigned);
-+            
-+    /* initialize IO registers */
-+    gfx_info.guest_pio_base = dev->io_regions[ATI_BAR5_INDEX].addr;
-+    gfx_info.pio_size = dev->io_regions[ATI_BAR5_INDEX].size;
-+    gfx_info.host_pio_base = assigned->bases[ATI_BAR5_INDEX].access.pio_base;
-+
-+    gfx_info.guest_mmio_base1 = dev->io_regions[ATI_BAR1_INDEX].addr;
-+    gfx_info.guest_mmio_base2 = dev->io_regions[ATI_BAR2_INDEX].addr;
-+    gfx_info.initialized = 1;
-+
-+    PT_LOG("guest_pio_bar = 0x%x, host_pio_bar = 0x%x, pio_size=0x%x "
-+           "guest_mmio_bar1=0x%x, guest_mmio_bar2=0x%x\n", 
-+           gfx_info.guest_pio_base, gfx_info.host_pio_base, gfx_info.pio_size, 
-+           gfx_info.guest_mmio_base1, gfx_info.guest_mmio_base2);
-+}
-+
-+static uint32_t ati_legacy_io_read(void *opaque, uint32_t addr)
-+{
-+    struct pt_dev *assigned_device = opaque;
-+    PCIDevice *dev = (PCIDevice *)&assigned_device->dev;
-+    uint32_t val = 0xFF;
-+
-+    switch( addr )
-+    {
-+    case 0x3c3:
-+        val = dev->io_regions[ATI_BAR5_INDEX].addr >> 8;
-+        /* Intercept GFX IO registers. This supposes to happen in 
-+         * ati_register_vga_regions(). But we cannot get guest phys IO BAR 
-+         * over there. */
-+        if ( !gfx_info.initialized )
-+            ati_gfx_init(assigned_device);
-+        break;
-+    default:
-+        PT_LOG("ERROR: port 0x%x I/O read not handled\n", addr);
-+        break;
-+    }
-+
-+    return val;
-+}
-+
-+static void ati_legacy_io_write(void *opaque, uint32_t addr, uint32_t val)
-+{
-+    PT_LOG("ERROR: port 0x%x I/O write not handled\n", addr);
-+}
-+
-+int ati_register_vga_regions(struct pt_dev *real_device)
-+{
-+    PCIDevice *dev = (PCIDevice *)&real_device->dev;
-+    int ret = 0;
-+
-+    /* We need to intercept VBIOS accesses to port 0x3C3, which returns 
-+     * device port I/O BAR. For the rest of legacy I/O ports, we allow direct
-+     * accesses.
-+     */
-+    ret |= xc_domain_ioport_mapping(xc_handle, domid, 0x3C0,
-+            0x3C0, 0x3, DPCI_ADD_MAPPING);
-+    
-+    ret |= xc_domain_ioport_mapping(xc_handle, domid, 0x3C4,
-+            0x3C4, 0x1C, DPCI_ADD_MAPPING);
-+
-+    register_ioport_read(0x3c3, 1, 1, ati_legacy_io_read, real_device);
-+    register_ioport_write(0x3c3, 1, 1, ati_legacy_io_write, real_device);
-+
-+    /* initialized on the first port 0x3C3 access in ati_gfx_init */
-+    gfx_info.initialized = 0;
-+
-+    return ret;
-+}
-+
-+int ati_unregister_vga_regions(struct pt_dev *real_device)
-+{
-+    int ret = 0;
-+
-+    ret |= xc_domain_ioport_mapping(xc_handle, domid, 0x3C0,
-+            0x3C0, 0x3, DPCI_REMOVE_MAPPING);
-+    
-+    ret |= xc_domain_ioport_mapping(xc_handle, domid, 0x3C4,
-+            0x3C4, 0x1C, DPCI_REMOVE_MAPPING);
-+
-+    gfx_info.initialized = 0;
-+
-+    return ret;
-+}
-+
-+/*********************************/
-+/*  Code for Intel IGD Passthru  */
-+/*********************************/
- 
- static uint32_t igd_guest_opregion = 0;
- 
-@@ -176,6 +377,77 @@ read_default:
-    return pci_default_read_config(pci_dev, config_addr, len);
- }
- 
-+int igd_register_vga_regions(struct pt_dev *real_device)
-+{
-+    u32 vendor_id, igd_opregion;
-+    int ret = 0;
-+    
-+    /* legacy I/O ports 0x3C0 -- 0x3E0 */
-+    ret |= xc_domain_ioport_mapping(xc_handle, domid, 0x3C0,
-+            0x3C0, 0x20, DPCI_ADD_MAPPING);
-+
-+    /* 1:1 map ASL Storage register value */
-+    vendor_id = pt_pci_host_read(real_device->pci_dev, PCI_VENDOR_ID, 2);
-+    igd_opregion = pt_pci_host_read(real_device->pci_dev, PCI_INTEL_OPREGION, 4);
-+    if ( (vendor_id == PCI_VENDOR_ID_INTEL) && igd_opregion )
-+    {
-+        ret |= xc_domain_memory_mapping(xc_handle, domid,
-+                igd_opregion >> XC_PAGE_SHIFT,
-+                igd_opregion >> XC_PAGE_SHIFT,
-+                2,
-+                DPCI_ADD_MAPPING);
-+        PT_LOG("register_vga: igd_opregion = %x\n", igd_opregion);
-+    }
-+
-+    return ret;
-+}
-+
-+int igd_unregister_vga_regions(struct pt_dev *real_device)
-+{
-+    u32 vendor_id, igd_opregion;
-+    int ret = 0;
-+
-+    ret |= xc_domain_ioport_mapping(xc_handle, domid, 0x3C0,
-+            0x3C0, 0x20, DPCI_REMOVE_MAPPING);
-+
-+    vendor_id = pt_pci_host_read(real_device->pci_dev, PCI_VENDOR_ID, 2);
-+    igd_opregion = pt_pci_host_read(real_device->pci_dev, PCI_INTEL_OPREGION, 4);
-+    if ( (vendor_id == PCI_VENDOR_ID_INTEL) && igd_opregion )
-+    {
-+        ret |= xc_domain_memory_mapping(xc_handle, domid,
-+                igd_opregion >> XC_PAGE_SHIFT,
-+                igd_opregion >> XC_PAGE_SHIFT,
-+                2,
-+                DPCI_REMOVE_MAPPING);
-+    }
-+
-+    return ret;
-+}
-+/*********************************/
-+/* Generic Code for GFX Passthru */
-+/*********************************/
-+/* This function decides whether I/O port map should be skipped */
-+int vga_skip_ioport_map(PCIDevice *d)
-+{
-+    struct pt_dev *dev = (struct pt_dev *)d;
-+    int skip = 0;
-+
-+    if ( !gfx_passthru || dev->pci_dev->device_class != 0x0300 )
-+        return 0;
-+
-+    switch( dev->pci_dev->vendor_id ) 
-+    {
-+    case PCI_VENDOR_ID_ATI:
-+    case PCI_VENDOR_ID_AMD:
-+        skip = 1;
-+        break;
-+    default:
-+        skip = 0;
-+        break;
-+    }
-+        
-+    return skip;
-+}
- /*
-  * register VGA resources for the domain with assigned gfx
-  */
-@@ -187,18 +459,33 @@ int register_vga_regions(struct pt_dev *
-     if ( !gfx_passthru || real_device->pci_dev->device_class != 0x0300 )
-         return ret;
- 
-+    /* legacy I/O ports 0x3B0 - 0x3BC */
-     ret |= xc_domain_ioport_mapping(xc_handle, domid, 0x3B0,
-             0x3B0, 0xC, DPCI_ADD_MAPPING);
- 
--    ret |= xc_domain_ioport_mapping(xc_handle, domid, 0x3C0,
--            0x3C0, 0x20, DPCI_ADD_MAPPING);
--
-+    /* legacy video MMIO range 0xA0000 - 0xBFFFF */
-     ret |= xc_domain_memory_mapping(xc_handle, domid,
-             0xa0000 >> XC_PAGE_SHIFT,
-             0xa0000 >> XC_PAGE_SHIFT,
-             0x20,
-             DPCI_ADD_MAPPING);
- 
-+    /* Other VGA regions are vendor specific */
-+    switch( real_device->pci_dev->vendor_id ) 
-+    {
-+    case PCI_VENDOR_ID_INTEL:
-+	    ret = igd_register_vga_regions(real_device);
-+	    break;
-+    case PCI_VENDOR_ID_ATI:
-+    case PCI_VENDOR_ID_AMD:
-+	    ret = ati_register_vga_regions(real_device);
-+	    break;
-+    default:
-+	    PT_LOG("gfx card wasn't supported by Xen passthru!\n");
-+	    ret = 1;
-+	    break;
-+    }
-+
-     if ( ret != 0 )
-         PT_LOG("VGA region mapping failed\n");
- 
-@@ -216,26 +503,31 @@ int unregister_vga_regions(struct pt_dev
-     if ( !gfx_passthru || real_device->pci_dev->device_class != 0x0300 )
-         return ret;
- 
-+    /* legacy I/O ports 0x3B0 - 0x3BC */
-     ret |= xc_domain_ioport_mapping(xc_handle, domid, 0x3B0,
-             0x3B0, 0xC, DPCI_REMOVE_MAPPING);
- 
--    ret |= xc_domain_ioport_mapping(xc_handle, domid, 0x3C0,
--            0x3C0, 0x20, DPCI_REMOVE_MAPPING);
--
-+    /* legacy video MMIO range 0xA0000 - 0xBFFFF */
-     ret |= xc_domain_memory_mapping(xc_handle, domid,
-             0xa0000 >> XC_PAGE_SHIFT,
-             0xa0000 >> XC_PAGE_SHIFT,
-             20,
-             DPCI_REMOVE_MAPPING);
- 
--    vendor_id = pt_pci_host_read(real_device->pci_dev, PCI_VENDOR_ID, 2);
--    if ( (vendor_id == PCI_VENDOR_ID_INTEL) && igd_guest_opregion )
-+    /* Other VGA regions are vendor specific */
-+    switch( real_device->pci_dev->vendor_id ) 
-     {
--        ret |= xc_domain_memory_mapping(xc_handle, domid,
--                igd_guest_opregion >> XC_PAGE_SHIFT,
--                igd_guest_opregion >> XC_PAGE_SHIFT,
--                2,
--                DPCI_REMOVE_MAPPING);
-+    case PCI_VENDOR_ID_INTEL:
-+	    ret = igd_unregister_vga_regions(real_device);
-+	    break;
-+    case PCI_VENDOR_ID_ATI:
-+    case PCI_VENDOR_ID_AMD:
-+	    ret = ati_unregister_vga_regions(real_device);
-+	    break;
-+    default:
-+	    PT_LOG("gfx card wasn't supported by Xen passthru!\n");
-+	    ret = 1;
-+	    break;
-     }
- 
-     if ( ret != 0 )
diff --git a/09_xen b/grub-mkconfig-helper
index 59ac88ac48fe..59ac88ac48fe 100644
--- a/09_xen
+++ b/grub-mkconfig-helper
diff --git a/patch-gcc6-etherboot-ath9k-9287-array.patch b/patch-gcc6-etherboot-ath9k-9287-array.patch
deleted file mode 100644
index 7b1f369b1edf..000000000000
--- a/patch-gcc6-etherboot-ath9k-9287-array.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 83d6f1f15f8cce844b0a131cbc63e444620e48b5 Mon Sep 17 00:00:00 2001
-From: Arnd Bergmann <arnd@arndb.de>
-Date: Mon, 14 Mar 2016 15:18:36 +0100
-Subject: ath9k: fix buffer overrun for ar9287
-
-Code that was added back in 2.6.38 has an obvious overflow
-when accessing a static array, and at the time it was added
-only a code comment was put in front of it as a reminder
-to have it reviewed properly.
-
-This has not happened, but gcc-6 now points to the specific
-overflow:
-
-drivers/net/wireless/ath/ath9k/eeprom.c: In function 'ath9k_hw_get_gain_boundaries_pdadcs':
-drivers/net/wireless/ath/ath9k/eeprom.c:483:44: error: array subscript is above array bounds [-Werror=array-bounds]
-     maxPwrT4[i] = data_9287[idxL].pwrPdg[i][4];
-                   ~~~~~~~~~~~~~~~~~~~~~~~~~^~~
-
-It turns out that the correct array length exists in the local
-'intercepts' variable of this function, so we can just use that
-instead of hardcoding '4', so this patch changes all three
-instances to use that variable. The other two instances were
-already correct, but it's more consistent this way.
-
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Fixes: 940cd2c12ebf ("ath9k_hw: merge the ar9287 version of ath9k_hw_get_gain_boundaries_pdadcs")
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- drivers/net/wireless/ath/ath9k/eeprom.c | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/net/wireless/ath/ath9k/eeprom.c b/drivers/net/wireless/ath/ath9k/eeprom.c
-index 73fb423..a794157 100644
---- a/src/drivers/net/ath/ath9k/ath9k_eeprom.c
-+++ b/src/drivers/net/ath/ath9k/ath9k_eeprom.c
-@@ -477,10 +477,9 @@ void ath9k_hw_get_gain_boundaries_pdadcs(struct ath_hw *ah,
- 
- 	if (match) {
- 		if (AR_SREV_9287(ah)) {
--			/* FIXME: array overrun? */
- 			for (i = 0; i < numXpdGains; i++) {
- 				minPwrT4[i] = data_9287[idxL].pwrPdg[i][0];
--				maxPwrT4[i] = data_9287[idxL].pwrPdg[i][4];
-+				maxPwrT4[i] = data_9287[idxL].pwrPdg[i][intercepts - 1];
- 				ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i],
- 						data_9287[idxL].pwrPdg[i],
- 						data_9287[idxL].vpdPdg[i],
-@@ -490,7 +489,7 @@ void ath9k_hw_get_gain_boundaries_pdadcs(struct ath_hw *ah,
- 		} else if (eeprom_4k) {
- 			for (i = 0; i < numXpdGains; i++) {
- 				minPwrT4[i] = data_4k[idxL].pwrPdg[i][0];
--				maxPwrT4[i] = data_4k[idxL].pwrPdg[i][4];
-+				maxPwrT4[i] = data_4k[idxL].pwrPdg[i][intercepts - 1];
- 				ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i],
- 						data_4k[idxL].pwrPdg[i],
- 						data_4k[idxL].vpdPdg[i],
-@@ -500,7 +499,7 @@ void ath9k_hw_get_gain_boundaries_pdadcs(struct ath_hw *ah,
- 		} else {
- 			for (i = 0; i < numXpdGains; i++) {
- 				minPwrT4[i] = data_def[idxL].pwrPdg[i][0];
--				maxPwrT4[i] = data_def[idxL].pwrPdg[i][4];
-+				maxPwrT4[i] = data_def[idxL].pwrPdg[i][intercepts - 1];
- 				ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i],
- 						data_def[idxL].pwrPdg[i],
- 						data_def[idxL].vpdPdg[i],
--- 
-cgit v0.12
-
diff --git a/patch-gcc6-etherboot-e1000_phy.c.patch b/patch-gcc6-etherboot-e1000_phy.c.patch
deleted file mode 100644
index 4cd6c246c1b9..000000000000
--- a/patch-gcc6-etherboot-e1000_phy.c.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -aur a/src/drivers/net/e1000/e1000_phy.c b/src/drivers/net/e1000/e1000_phy.c
---- a/src/drivers/net/e1000/e1000_phy.c	2016-05-12 19:40:13.950772568 +1000
-+++ b/src/drivers/net/e1000/e1000_phy.c	2016-05-12 19:41:08.429089344 +1000
-@@ -164,7 +164,7 @@
- 
- 	DEBUGFUNC("e1000_get_phy_id");
- 
--	if (!(phy->ops.read_reg))
-+	if (!(phy->ops.read_reg)) {
- 		goto out;
- 
- 		ret_val = phy->ops.read_reg(hw, PHY_ID1, &phy_id);
-@@ -179,6 +179,7 @@
- 
- 		phy->id |= (u32)(phy_id & PHY_REVISION_MASK);
- 		phy->revision = (u32)(phy_id & ~PHY_REVISION_MASK);
-+	}
- 
- out:
- 	return ret_val;
diff --git a/patch-gcc6-etherboot-igb_phy.c.patch b/patch-gcc6-etherboot-igb_phy.c.patch
deleted file mode 100644
index 44beb4baa932..000000000000
--- a/patch-gcc6-etherboot-igb_phy.c.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -aur a/src/drivers/net/igb/igb_phy.c b/src/drivers/net/igb/igb_phy.c
---- a/src/drivers/net/igb/igb_phy.c	2016-05-12 19:53:45.063246296 +1000
-+++ b/src/drivers/net/igb/igb_phy.c	2016-05-12 19:54:09.992692278 +1000
-@@ -88,7 +88,7 @@
- 
- 	DEBUGFUNC("igb_get_phy_id");
- 
--	if (!(phy->ops.read_reg))
-+	if (!(phy->ops.read_reg)) {
- 		goto out;
- 
- 		ret_val = phy->ops.read_reg(hw, PHY_ID1, &phy_id);
-@@ -103,6 +103,7 @@
- 
- 		phy->id |= (u32)(phy_id & PHY_REVISION_MASK);
- 		phy->revision = (u32)(phy_id & ~PHY_REVISION_MASK);
-+	}
- 
- out:
- 	return ret_val;
diff --git a/patch-gcc6-etherboot-rm-unused-string-functions.patch b/patch-gcc6-etherboot-rm-unused-string-functions.patch
deleted file mode 100644
index 991d433301f4..000000000000
--- a/patch-gcc6-etherboot-rm-unused-string-functions.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From b54167b8b6a35c7dab19bbe4b421d447036558d4 Mon Sep 17 00:00:00 2001
-From: Michael Brown <mcb30@ipxe.org>
-Date: Mon, 16 Feb 2015 15:33:32 +0000
-Subject: [PATCH] [libc] Remove unused string functions
-
-Signed-off-by: Michael Brown <mcb30@ipxe.org>
----
- src/core/stringextra.c |  188 ------------------------------------------------
- src/include/string.h   |    6 --
- 2 files changed, 0 insertions(+), 194 deletions(-)
-
-diff --git a/src/core/stringextra.c b/src/core/stringextra.c
-index 0a50985..18ffc63 100644
---- a/src/core/stringextra.c
-+++ b/src/core/stringextra.c
-@@ -38,122 +38,6 @@ FILE_LICENCE ( GPL2_ONLY );
- 
- /* *** FROM string.c *** */
- 
--#ifndef __HAVE_ARCH_STRNICMP
--/**
-- * strnicmp - Case insensitive, length-limited string comparison
-- * @s1: One string
-- * @s2: The other string
-- * @len: the maximum number of characters to compare
-- */
--int strnicmp(const char *s1, const char *s2, size_t len)
--{
--	/* Yes, Virginia, it had better be unsigned */
--	unsigned char c1, c2;
--
--	c1 = 0;	c2 = 0;
--	if (len) {
--		do {
--			c1 = *s1; c2 = *s2;
--			s1++; s2++;
--			if (!c1)
--				break;
--			if (!c2)
--				break;
--			if (c1 == c2)
--				continue;
--			c1 = tolower(c1);
--			c2 = tolower(c2);
--			if (c1 != c2)
--				break;
--		} while (--len);
--	}
--	return (int)c1 - (int)c2;
--}
--#endif
--
--char * ___strtok;
--
--#ifndef __HAVE_ARCH_STRNCAT
--/**
-- * strncat - Append a length-limited, %NUL-terminated string to another
-- * @dest: The string to be appended to
-- * @src: The string to append to it
-- * @count: The maximum numbers of bytes to copy
-- *
-- * Note that in contrast to strncpy, strncat ensures the result is
-- * terminated.
-- */
--char * strncat(char *dest, const char *src, size_t count)
--{
--	char *tmp = dest;
--
--	if (count) {
--		while (*dest)
--			dest++;
--		while ((*dest++ = *src++)) {
--			if (--count == 0) {
--				*dest = '\0';
--				break;
--			}
--		}
--	}
--
--	return tmp;
--}
--#endif
--
--#ifndef __HAVE_ARCH_STRSPN
--/**
-- * strspn - Calculate the length of the initial substring of @s which only
-- * 	contain letters in @accept
-- * @s: The string to be searched
-- * @accept: The string to search for
-- */
--size_t strspn(const char *s, const char *accept)
--{
--	const char *p;
--	const char *a;
--	size_t count = 0;
--
--	for (p = s; *p != '\0'; ++p) {
--		for (a = accept; *a != '\0'; ++a) {
--			if (*p == *a)
--				break;
--		}
--		if (*a == '\0')
--			return count;
--		++count;
--	}
--
--	return count;
--}
--#endif
--
--#ifndef __HAVE_ARCH_STRCSPN
--/**
-- * strcspn - Calculate the length of the initial substring of @s which only
-- * 	contain letters not in @reject
-- * @s: The string to be searched
-- * @accept: The string to search for
-- */
--size_t strcspn(const char *s, const char *reject)
--{
--	const char *p;
--	const char *r;
--	size_t count = 0;
--
--	for (p = s; *p != '\0'; ++p) {
--		for (r = reject; *r != '\0'; ++r) {
--			if (*p == *r)
--				return count;
--		}
--		++count;
--	}
--
--	return count;
--}
--#endif
--
- #ifndef __HAVE_ARCH_STRPBRK
- /**
-  * strpbrk - Find the first occurrence of a set of characters
-@@ -174,35 +58,6 @@ char * strpbrk(const char * cs,const char * ct)
- }
- #endif
- 
--#ifndef __HAVE_ARCH_STRTOK
--/**
-- * strtok - Split a string into tokens
-- * @s: The string to be searched
-- * @ct: The characters to search for
-- *
-- * WARNING: strtok is deprecated, use strsep instead.
-- */
--char * strtok(char * s,const char * ct)
--{
--	char *sbegin, *send;
--
--	sbegin  = s ? s : ___strtok;
--	if (!sbegin) {
--		return NULL;
--	}
--	sbegin += strspn(sbegin,ct);
--	if (*sbegin == '\0') {
--		___strtok = NULL;
--		return( NULL );
--	}
--	send = strpbrk( sbegin, ct);
--	if (send && *send != '\0')
--		*send++ = '\0';
--	___strtok = send;
--	return (sbegin);
--}
--#endif
--
- #ifndef __HAVE_ARCH_STRSEP
- /**
-  * strsep - Split a string into tokens
-@@ -230,46 +85,3 @@ char * strsep(char **s, const char *ct)
- 	return sbegin;
- }
- #endif
--
--#ifndef __HAVE_ARCH_BCOPY
--/**
-- * bcopy - Copy one area of memory to another
-- * @src: Where to copy from
-- * @dest: Where to copy to
-- * @count: The size of the area.
-- *
-- * Note that this is the same as memcpy(), with the arguments reversed.
-- * memcpy() is the standard, bcopy() is a legacy BSD function.
-- *
-- * You should not use this function to access IO space, use memcpy_toio()
-- * or memcpy_fromio() instead.
-- */
--char * bcopy(const char * src, char * dest, int count)
--{
--	return memmove(dest,src,count);
--}
--#endif
--
--#ifndef __HAVE_ARCH_MEMSCAN
--/**
-- * memscan - Find a character in an area of memory.
-- * @addr: The memory area
-- * @c: The byte to search for
-- * @size: The size of the area.
-- *
-- * returns the address of the first occurrence of @c, or 1 byte past
-- * the area if @c is not found
-- */
--void * memscan(const void * addr, int c, size_t size)
--{
--	unsigned char * p = (unsigned char *) addr;
--
--	while (size) {
--		if (*p == c)
--			return (void *) p;
--		p++;
--		size--;
--	}
--  	return (void *) p;
--}
--#endif
-diff --git a/src/include/string.h b/src/include/string.h
-index 3482e1b..dfd78a6 100644
---- a/src/include/string.h
-+++ b/src/include/string.h
-@@ -19,11 +19,9 @@ FILE_LICENCE ( GPL2_ONLY );
- #include <stddef.h>
- #include <bits/string.h>
- 
--int __pure strnicmp(const char *s1, const char *s2, size_t len) __nonnull;
- char * strcpy(char * dest,const char *src) __nonnull;
- char * strncpy(char * dest,const char *src,size_t count) __nonnull;
- char * strcat(char * dest, const char * src) __nonnull;
--char * strncat(char *dest, const char *src, size_t count) __nonnull;
- int __pure strcmp(const char * cs,const char * ct) __nonnull;
- int __pure strncmp(const char * cs,const char * ct,
- 				     size_t count) __nonnull;
-@@ -31,16 +29,12 @@ char * __pure strchr(const char * s, int c) __nonnull;
- char * __pure strrchr(const char * s, int c) __nonnull;
- size_t __pure strlen(const char * s) __nonnull;
- size_t __pure strnlen(const char * s, size_t count) __nonnull;
--size_t __pure strspn(const char *s, const char *accept) __nonnull;
--size_t __pure strcspn(const char *s, const char *reject) __nonnull;
- char * __pure strpbrk(const char * cs,const char * ct) __nonnull;
--char * strtok(char * s,const char * ct) __nonnull;
- char * strsep(char **s, const char *ct) __nonnull;
- void * memset(void * s,int c,size_t count) __nonnull;
- void * memmove(void * dest,const void *src,size_t count) __nonnull;
- int __pure memcmp(const void * cs,const void * ct,
- 				    size_t count) __nonnull;
--void * __pure memscan(const void * addr, int c, size_t size) __nonnull;
- char * __pure strstr(const char * s1,const char * s2) __nonnull;
- void * __pure memchr(const void *s, int c, size_t n) __nonnull;
- char * __malloc strdup(const char *s) __nonnull;
--- 
-1.7.9
-
diff --git a/patch-gcc6-etherboot-via-rhine.c.patch b/patch-gcc6-etherboot-via-rhine.c.patch
deleted file mode 100644
index 697208ae3fd8..000000000000
--- a/patch-gcc6-etherboot-via-rhine.c.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -aru a/src/drivers/net/via-rhine.c b/src/drivers/net/via-rhine.c
---- a/src/drivers/net/via-rhine.c	2016-05-12 19:24:14.047825550 +1000
-+++ b/src/drivers/net/via-rhine.c	2016-05-12 19:33:18.061858418 +1000
-@@ -945,13 +945,15 @@
-             /* added comment by guard */
-             /* For supporting VT6107, please use revision id to recognize different chips in driver */
-             // if (tp->chip_id == 0x3065)
--            if( tp->chip_revision < 0x80 && tp->chip_revision >=0x40 )
-+            if( tp->chip_revision < 0x80 && tp->chip_revision >=0x40 ) {
-                 intr_status |= inb(nic->ioaddr + IntrStatus2) << 16;
-                 intr_status = (intr_status & ~DEFAULT_INTR);
--                if ( action == ENABLE ) 
-+                if ( action == ENABLE ) {
-                     intr_status = intr_status | DEFAULT_INTR;
-                     outw(intr_status, nic->ioaddr + IntrEnable);
-+                }
-                 break;
-+            }
-         case FORCE :
-             outw(0x0010, nic->ioaddr + 0x84);
-            break;
diff --git a/patch-gcc6-etherboot-via-velocity.c.patch b/patch-gcc6-etherboot-via-velocity.c.patch
deleted file mode 100644
index 36a3d81158f4..000000000000
--- a/patch-gcc6-etherboot-via-velocity.c.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur a/src/drivers/net/via-velocity.c b/src/drivers/net/via-velocity.c
---- a/src/drivers/net/via-velocity.c	2016-05-12 19:14:33.231788641 +1000
-+++ b/src/drivers/net/via-velocity.c	2016-05-12 19:17:08.235494746 +1000
-@@ -69,7 +69,7 @@
- 
- /* NIC specific static variables go here */
- #define VELOCITY_PARAM(N,D) \
--        static const int N[MAX_UNITS]=OPTION_DEFAULT;
-+        static __attribute__ ((unused)) const int N[MAX_UNITS]=OPTION_DEFAULT;
- /*        MODULE_PARM(N, "1-" __MODULE_STRING(MAX_UNITS) "i");\
-         MODULE_PARM_DESC(N, D); */
- 
diff --git a/tmpfiles.d-xen.conf b/tmpfiles.conf
index a55258b0feae..a55258b0feae 100644
--- a/tmpfiles.d-xen.conf
+++ b/tmpfiles.conf
diff --git a/xen.install b/xen.install
index a15206874e8a..e7582d4e0b23 100644
--- a/xen.install
+++ b/xen.install
@@ -1,5 +1,5 @@
 install_msg() {
-    cat << __EOF__
+	cat << __EOF__
 ===> IMPORTANT NOTICES:
 
 In order to complete the installation, and enable Xen,
@@ -31,41 +31,43 @@ __EOF__
 }
 
 upgrade_msg() {
-    cat << __EOF__
-Xen 4.7
+	cat << __EOF__
+Xen 4.8
 Release notes
-http://wiki.xen.org/wiki/Xen_Project_4.7_Release_Notes
+http://wiki.xen.org/wiki/Xen_Project_4.8_Release_Notes
 Feature list
-http://wiki.xen.org/wiki/Xen_Project_4.7_Feature_List
+http://wiki.xen.org/wiki/Xen_Project_4.8_Feature_List
 __EOF__
 
 }
 
 post_install() {
-    install_msg
-    upgrade_msg
+	install_msg
+	upgrade_msg
+	systemd-tmpfiles --create
 }
 
 post_upgrade() {
-    upgrade_msg
+	upgrade_msg
+	systemd-tmpfiles --create
 }
 
 pre_remove() {
-   systemctl stop xendomains.service
-   systemctl stop xen-watchdog.service
-   systemctl stop xenconsoled.service
-   systemctl stop xen-init-dom0.service
-   systemctl stop xen-qemu-dom0-disk-backend.service
-
-   systemctl disable xendomains.service
-   systemctl disable xen-watchdog.service
-   systemctl disable xenconsoled.service
-   systemctl disable xen-init-dom0.service
-   systemctl disable xen-qemu-dom0-disk-backend.service
+	systemctl stop xendomains.service
+	systemctl stop xen-watchdog.service
+	systemctl stop xenconsoled.service
+	systemctl stop xen-init-dom0.service
+	systemctl stop xen-qemu-dom0-disk-backend.service
+
+	systemctl disable xendomains.service
+	systemctl disable xen-watchdog.service
+	systemctl disable xenconsoled.service
+	systemctl disable xen-init-dom0.service
+	systemctl disable xen-qemu-dom0-disk-backend.service
 }
 
 post_remove() {
-    cat << __EOF__
+	cat << __EOF__
 ===> IMPORTANT NOTICE:
 
 In order to finish removing Xen, you will need to modify
author	Janne Heß	2017-01-12 18:16:55 +0100
committer	Janne Heß	2017-01-12 23:50:19 +0100
commit	68c6c51b915780c891fc38ae82fcc8b44fb05a65 (patch)
tree	a0d44078a7929c0774fc616ef8c9f76927c70c4c
parent	035aa6e93208e6806d6ff0a38dcae88b1baab360 (diff)
download	aur-68c6c51b915780c891fc38ae82fcc8b44fb05a65.tar.gz