pcr/xen: update to 4.9.0

1 files changed, 379 insertions, 206 deletions

diff --git a/pcr/xen/PKGBUILD b/pcr/xen/PKGBUILD
index e6f8e5d23..c52c13c2f 100644
--- a/pcr/xen/PKGBUILD
+++ b/pcr/xen/PKGBUILD
@@ -1,100 +1,164 @@
-# Maintainer (Arch): David Sutton <kantras - gmail.com>
+# current version adapted from https://gitlab.com/johnth/aur-xen/blob/717dc1c8e32c3c615652f2b40838d1cb12441073/PKGBUILD
+
+# Maintainer (AUR): John Thomson <aur.xen at j0aur.mm.st>
+# Contributor (Arch): David Sutton <kantras - gmail.com>
 # Contributor (Arch): Shanmu Thiagaraja <sthiagaraja+AUR@prshanmu.com>
 # Contributor (Arch): Limao Luo
 # Contributor (Arch): Luceo
 # Contributor (Arch): Revellion
-# Contributor (Arch): John Thomson
-# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: André Silva <emulatorman@parabola.nu>
 # Contributor: Márcio Silva <coadde@parabola.nu>
+# Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info>
+
+#linux-4.7 EFI boot panic issue (patch linux)
+#http://lkml.iu.edu/hypermail/linux/kernel/1608.2/03448.html
 
+_build_stubdom="${build_stubdom:-false}"
+_system_seabios="${system_seabios:-false}"
+_build_debug="${build_debug:-false}"
+_build_livepatch="${build_livepatch:-false}"
 
-_build_stubdom=${build_stubdom:-false}
 ## use _build_stubdom=true to build xen with stubdom
-#_build_stubdom=true
+## use _system_seabios=true to use system seabios
+## this bios file is slightly different to the xen seabios
+## /usr/share/qemu/bios-256k.bin uses CONFIG_ROM_SIZE=256, and newer seabios
+## can force use this file through vm.cfg bios_path_override='/usr/share/qemu/bios-256k.bin'
+## use _build_debug=true to compile Xen with debug options
+## use _build_livepatch=true to compile Xen with livepatch support
 
-pkgname=xen
-pkgver=4.7.0
-pkgrel=1.parabola1.1
+#_build_stubdom=true
+#_system_seabios=true
+#_build_debug=true
+#_build_livepatch=true
+
+pkgbase=xen
+pkgname=(xen{,-docs,-syms})
+_pkgname=xen
+pkgver=4.9.0
+_pkgver=${pkgver/rc/-rc}
+pkgrel=1.parabola1
 pkgdesc="Virtual Machine Hypervisor & Tools (Parabola rebranded)"
-arch=(x86_64)
-url="http://www.xenproject.org/"
-license=(GPL2)
-depends=(bridge-utils curl gnutls iproute2 libaio libcap-ng libiscsi libnl libpng lzo 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)
+arch=(x86_64 armv7h)
+depends=(
+    bridge-utils
+    curl
+    gnutls
+    iproute2
+    libaio
+    libcap-ng
+    libiscsi
+    libnl
+    libpng
+    lzo
+    pciutils
+    python2
+    sdl
+    spice
+    systemd
+    usbredir
+    yajl
+    # seabios ovmf qemu
+)
+[[ "$CARCH" == 'x86_64' ]] && depends+=(
+    lib32-glibc
+)
+[[ "$CARCH" == *'arm'* ]] && depends+=(
+    dtc-overlay
+)
+[[ "$_system_seabios" == true ]] && depends+=(
+    seabios
+)
+url='http://www.xenproject.org/'
+license=('GPL2')
+makedepends=(
+    cmake
+    figlet
+    git
+    markdown
+    nasm
+    ocaml-findlib
+    spice-protocol
+    wget
+)
+[[ "$CARCH" == 'x86_64' ]] && makedepends+=(
+    bin86
+    dev86
+    gcc-multilib
+    iasl
+)
 
 ## 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)
 _binutils_efi=false
-if [[ $_binutils_emulations == *'i386pep'* ]]
-then
-    _binutils_efi=true
-    echo 'ld has efi support'
-else
-    makedepends+=(mingw-w64-binutils)
-    echo 'ld does not have efi support, using mingw'
-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)
-backup=(
-        etc/modules-load.d/$pkgname.conf
-        etc/$pkgname/xl.conf
-        etc/conf.d/xen{stored,consoled,domains,commons}
-        etc/$pkgname/grub.conf
+if [[ "$CARCH" == 'x86_64' ]]; then
+    _binutils_emulations="$(ld -V)"
+    if [[ "$_binutils_emulations" == *'i386pep'* ]]; then
+        _binutils_efi=true
+        echo '#ld has efi support'
+    else
+        makedepends+=(
+            mingw-w64-binutils
         )
+        echo '#ld does not have efi support, using mingw'
+    fi
+fi
+
+
 options=(!buildflags !strip)
-install=$pkgname.install
 changelog=ChangeLog
+
+##SeaBIOS & OVMF tags are in src/xen-*/tools/Config.mk
+##grep -rE '_(REVISION|VERSION|TAG)( \?| :){0,1}=' src/xen**/{Config.mk,stubdom/configure,tools/firmware/etherboot/Makefile}
+_git_tag_seabios='#tag=rel-1.10.0'
+_git_tag_ovmf='#tag=5920a9d16b1ab887c2858224316a98e961d71b05'
+_git_tag_ipxe='827dd1bfee67daa683935ce65316f7e0f057fe1c'
+
+if [[ "$_build_stubdom" == true ]]; then
+    if [[ "$CARCH" == *'arm'* ]]; then
+        echo '####Compile settings error:'
+        echo "#cannot build stubdom for $CARCH"
+        _build_stubdom=false
+    fi
+fi
+
 source=(
-    http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.gz
-    http://xenbits.xen.org/xen-extfiles/ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz
+    "https://downloads.xenproject.org/release/$_pkgname/$_pkgver/$_pkgname-$_pkgver.tar.gz"{,.sig}
+    "http://xenbits.xen.org/xen-extfiles/ipxe-git-$_git_tag_ipxe.tar.gz"
 
-    ##SeaBIOS & OVMF tags are in src/xen-*/tools/Config.mk
-    ##Can be found through: grep -R 'UPSTREAM_REVISION' src/xen-*/Config.mk
-    #'seabios'::'git://xenbits.xen.org/seabios.git#tag=rel-1.9.2'
-    #'ovmf'::'git://xenbits.xen.org/ovmf.git#tag=52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d'
+    '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#tag=rel-1.9.2'
-    'ovmf'::'git+http://xenbits.xen.org/git-http/ovmf.git#tag=52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d'
+    #'seabios'::"git+http://xenbits.xen.org/git-http/seabios.git$_git_tag_seabios"
 
     ## Compile patches
     ati-passthrough.patch
-    ovmf.patch
+    patch-ovmf-use-python2.patch
+    patch-ovmf-apply-inbuild-patches.patch
+    patch-ovmf-patches-series.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
+    patch-inbuild-ovmf-5-hiilib.c-pointer-zero.patch::'https://github.com/tianocore/edk2/commit/fe4a28ccbfd33cae9e1f56b174d46b4eb2329efd.patch'
+    patch-inbuild-ipxe-gcc7-implicit-fallthrough.patch::'https://github.com/ipxe/ipxe/commit/5f85cbb9ee1c00cec81a848a9e871ad5d1e7f53f.patch'
+    patch-inbuild-ipxe-gcc7-implicit-fallthrough-ath5k.patch::'https://github.com/ipxe/ipxe/commit/45f2265bfcbbf2afd7fac24372ae26e453f2b52d.patch'
+    patch-inbuild-ipxe-gcc7-implicit-fallthrough-curses.patch::'https://github.com/ipxe/ipxe/commit/28e26dd2503e6006fabb26f8c33050ba93a99623.patch'
+    patch-ipxe-patches-series.patch
+    patch-gcc7-vtpm-implicit-fallthrough.patch
+    patch-gcc7-vtpmmgr-make-inline-static.patch
+    patch-gcc7-minios-udivmod.patch
 
     ## Files
     xen.install
-    09_xen
+    21_linux_xen_multiboot_arch
     efi-xen.cfg
-    grub.conf
-    $pkgname.conf
-    tmpfiles.d-$pkgname.conf
+    "$_pkgname.conf"
+    "tmpfiles.d-$_pkgname.conf"
 
     ## XSA patches
-    )
+)
 
-if [ "$_build_stubdom" = true ] ; then
-    echo "building with stubdom"
+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
@@ -104,16 +168,16 @@ if [ "$_build_stubdom" = true ] ; then
         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://caml.inria.fr/pub/distrib/ocaml-3.11/ocaml-3.11.0.tar.gz
     )
 fi
 
 
 noextract=(
-    ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz
-    )
+    "ipxe-git-$_git_tag_ipxe.tar.gz"
+)
 
-if [ "$_build_stubdom" = true ] ; then
+if [[ "$_build_stubdom" == true ]]; then
     noextract+=(
         lwip-1.3.0.tar.gz
         zlib-1.2.3.tar.gz
@@ -123,75 +187,90 @@ if [ "$_build_stubdom" = true ] ; then
         grub-0.97.tar.gz
         tpm_emulator-0.7.4.tar.gz
         gmp-4.3.2.tar.bz2
-        #ocaml-3.11.0.tar.gz
+        ocaml-3.11.0.tar.gz
     )
 fi
 
+validpgpkeys=('23E3222C145F4475FA8060A783FE14C957E82BD9')
+#gpg --keyserver pgp.mit.edu --recv-key 23E3222C145F4475FA8060A783FE14C957E82BD9
 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
-            '7da2db54d35914284d60bb4474aff3538897dd3cf5065347b393d6e18a029292'
-            '92b8fc6679cc75bd993c8ead946eb1f212da03a52566b1c329d248fa1cdfe879'
-            '95f09bccc104d98c14559000823cb50f0d076f6a65b9f3b4e7725762b84ab5c7'
-            '3f0af16958c3e057b9baa5afc47050d9adf7dd553274dd97ae4f35938fefb568'
-            '50a9b7fd19e8beb1dea09755f07318f36be0b7ec53d3c9e74f3266a63e682c0c'
-            '40e0760810a49f925f2ae9f986940b40eba477dc6d3e83a78baaae096513b3cf'
-
-            ## XSA patches
-                )
-if [ "$_build_stubdom" = true ] ; then
+    'cade643fe3310d4d6f97d0c215c6fa323bc1130d7e64d7e2043ffaa73a96f33b'
+    'SKIP'
+    '36deacb946c59ad1d6600f6e5b89d6a7a8961e65eb000900e184075920120f49'
+
+    'SKIP'
+    'SKIP'
+
+    'd93c2d5bcdf0c3e4c6e8efb357cb4b9d618209025361f5ccd9d03651a8acd7a3'
+    '5fb65130f96d1728368a09042e55f622c14117572030ce2141bff4ae150e4a01'
+    'a853a38b8fd661d6b99979831cdae014cd23d831b57a90a467400660343f23f6'
+    '81b93e8c9e0ecb0d8c0555892b27b7e6c39d961af33cdea53ac72070e3e741b2'
+    #'a8ce42777e22af49080131e174b6b89c6e7597539838fb8b17a12280fd10b10b'
+    '79d8ce76bdeb72a1583254f1fb80309e56428d7406a6605a5ec860dc5a1beb3d'
+    'e042b0161d76ee9af7b113c46703dde2663f762d696f4290585be36d907e97a5'
+    '2be4efb8be044c9b2459d09f5a6390fecb218ed4cb38964bce0674882817b91a'
+    'db21442e38be53d342c7574c7c17fb8ce45e57c11dd1ad99e60641ea4061653b'
+    '9135c1ca7aed28a86afc7a0feb2930bd95b4fabf865dd368e8912cc77d38fb33'
+    '826cc633cd1a5b5ae88f50c3d94647a4a108747e946c398eb88f1dcc069be2b8'
+    'e5328145563a0e9a5f118f6d7b68468dca04d14bf97ab5699bf99d7d8b966f12'
+    'c2b004ad976c050ec19986cbca6586d2c137959f11a0c3494146a4ccb1e5f9d4'
+
+    #pkgbuild files
+    '330bcc5ab22e982d37495b57176d306353c220fec7c2b6c4a78a9133382a623e'
+    '7fa619845874e1a596acc5fb43b921496fba3014e04f40b2af462c51b02656ee'
+    '95f09bccc104d98c14559000823cb50f0d076f6a65b9f3b4e7725762b84ab5c7'
+    '50a9b7fd19e8beb1dea09755f07318f36be0b7ec53d3c9e74f3266a63e682c0c'
+    '40e0760810a49f925f2ae9f986940b40eba477dc6d3e83a78baaae096513b3cf'
+
+    ## XSA patches
+)
+
+
+if [[ "$_build_stubdom" == true ]]; then
     sha256sums+=(
-            #stubdom bits
-            '772e4d550e07826665ed0528c071dd5404ef7dbe1825a38c8adbc2a00bca948f'
-            '1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e'
-            'db426394965c48c1d29023e1cc6d965ea6b9a9035d8a849be2750ca4659a3d07'
-            'f60ae61cfbd5da1d849d0beaa21f593c38dac9359f0b3ddc612f447408265b24'
-            '2d29fd04a0d0ba29dae6bd29fb418944c08d3916665dcca74afb297ef37584b6'
-            '4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b'
-            '4e48ea0d83dd9441cc1af04ab18cd6c961b9fa54d5cbf2c2feee038988dea459'
-            '936162c0312886c21581002b79932829aa048cfaf9937c6265aeaa14f1cd1775'
-            #'ecdd4f8473ab0dee5d3acb5c0a31a4c1dd6aa12179895cf1903dd0f455c43a4f'
-
-            #stubdom patches
-            )
+        #stubdom bits
+        '772e4d550e07826665ed0528c071dd5404ef7dbe1825a38c8adbc2a00bca948f'
+        '1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e'
+        'db426394965c48c1d29023e1cc6d965ea6b9a9035d8a849be2750ca4659a3d07'
+        'f60ae61cfbd5da1d849d0beaa21f593c38dac9359f0b3ddc612f447408265b24'
+        '2d29fd04a0d0ba29dae6bd29fb418944c08d3916665dcca74afb297ef37584b6'
+        '4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b'
+        '4e48ea0d83dd9441cc1af04ab18cd6c961b9fa54d5cbf2c2feee038988dea459'
+        '936162c0312886c21581002b79932829aa048cfaf9937c6265aeaa14f1cd1775'
+        'ecdd4f8473ab0dee5d3acb5c0a31a4c1dd6aa12179895cf1903dd0f455c43a4f'
+
+        #stubdom patches
+    )
 fi
 
+_xen_kconfig_debug=$(cat <<EOF
+CONFIG_DEBUG=y
+CONFIG_CRASH_DEBUG=y
+EOF
+)
+_xen_kconfig_livepatch=$(cat <<EOF
+CONFIG_LIVEPATCH=y
+EOF
+)
+
+_makevars=(
+    LANG=C
+    PYTHON=python2
+)
+
 prepare() {
-    cd "$pkgname-$pkgver/"
+    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/
+    # move seabios into place
+    mv --force "$srcdir/seabios" tools/firmware/seabios-dir-remote
+    # move ovmf into place
+    mv --force "$srcdir/ovmf" tools/firmware/ovmf-dir-remote
 
-    ### Patching 
+    ### Patching
 
+    # XSA Patches
+    echo 'XSA patches'
     # Security Patches - Base
 
     # Security Patches - qemu-xen-traditional
@@ -202,139 +281,233 @@ prepare() {
     cd 'tools/qemu-xen/'
     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
+    if [[ "$_binutils_efi" != true ]]; then
+        if $(stat /usr/x86_64-w64-mingw32/bin/ld >/dev/null 2>&1); 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
+        else
+            echo '#Not capable of building xen.efi. Need either:'
+            echo '#(preferred) binutils compiled with --enable-targets=x86_64-pep'
+            echo '#or install mingw-w64-binutils'
+        fi
     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/
+    patch -Np1 -i "$srcdir/patch-ovmf-use-python2.patch"
+    patch -Np1 -i "$srcdir/patch-ovmf-apply-inbuild-patches.patch"
+    mkdir -p tools/firmware/ovmf-patches
+    patch -Np1 -i "$srcdir/patch-ovmf-patches-series.patch"
+    cp "$srcdir"/patch-inbuild-ovmf*.patch tools/firmware/ovmf-patches/
 
     # 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 fixed rundir paths
+    ## grep -Rl '\/var\/run\/xen' * 2> /dev/null
+    _var_run_fixed_paths=(
+        tools/hotplug/Linux/locking.sh
+        tools/xenmon/xenbaked.c
+        tools/xenmon/xenmon.py
+        tools/pygrub/src/pygrub
+    )
+    sed -i 's:/var/run:/run:' ${_var_run_fixed_paths[@]}
 
-    ## 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
+    ## Fix python version in shebang
+    echo 'Fix python shebang to python2'
+    _python_files=( $(grep -Rlse '^#!/usr/bin/.*python$' || : ) )
+    sed -Ei 's|(^#!.*/usr/bin/(env ){0,1})python$|\1python2|' ${_python_files[@]}
 
-    if [ "$_build_stubdom" = true ] ; then
+    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/
+        ln -s "$srcdir/lwip-1.3.0.tar.gz" stubdom/
+        ln -s "$srcdir/zlib-1.2.3.tar.gz" stubdom/
+        ln -s "$srcdir/newlib-1.16.0.tar.gz" stubdom/
+        ln -s "$srcdir/pciutils-2.2.9.tar.bz2" stubdom/
+        ln -s "$srcdir/polarssl-1.1.4-gpl.tgz" stubdom/
+        ln -s "$srcdir/grub-0.97.tar.gz" stubdom/
+        ln -s "$srcdir/tpm_emulator-0.7.4.tar.gz" stubdom/
+        ln -s "$srcdir/gmp-4.3.2.tar.bz2" stubdom/
+        ln -s "$srcdir/ocaml-3.11.0.tar.gz" stubdom/
 
         ## Stubdom patches
         cd 'extras/mini-os'
+        patch -Np1 -i "$srcdir/patch-gcc7-minios-udivmod.patch"
         cd '../../'
 
+        #vtpm
+        patch -Np1 -i "$srcdir/patch-gcc7-vtpmmgr-make-inline-static.patch"
+        patch -Np1 -i "$srcdir/patch-gcc7-vtpm-implicit-fallthrough.patch"
     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
-
-
+    ln -s "$srcdir/ipxe-git-$_git_tag_ipxe.tar.gz" tools/firmware/etherboot/ipxe.tar.gz
+    patch -Np1 -i "$srcdir/patch-ipxe-patches-series.patch"
+    cp "$srcdir"/patch-inbuild-ipxe*.patch tools/firmware/etherboot/patches/
 }
 
 build() {
-    cd "$pkgname-$pkgver/"
-    export LD_EFI="/usr/x86_64-w64-mingw32/bin/ld"
+    cd "$_pkgname-$_pkgver/"
+    export LD_EFI='/usr/x86_64-w64-mingw32/bin/ld'
     ./autogen.sh
-    if [ "$_build_stubdom" = true ] ; then
-        _config_stubdom='--enable-stubdom'
+    if [[ "$_build_stubdom" == true ]]; then
+        _config_stubdom=(--enable-stubdom)
+        _config_stubdom+=(
+            #--enable-ioemu-stubdom=no
+            #--enable-c-stubdom=no
+            #--enable-caml-stubdom=no
+            #--enable-pv-grub=no
+            #--enable-xenstore-stubdom=no
+            #--enable-vtpm-stubdom=no
+            #--enable-vtpmmgr-stubdom=no
+        )
+    else
+        _config_stubdom=(--disable-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"
+    _config_seabios=()
+    if [[ "$_system_seabios" == true ]]; then
+        _config_seabios=(--with-system-seabios=/usr/share/qemu/bios-256k.bin)
+    fi
+    _config_xen_kconfig=''
+    _config_debug=()
+    if [[ "$_build_debug" == true ]]; then
+        _config_debug=(--enable-debug --enable-debug-tcg --enable-debug-info)
+        _config_xen_kconfig+="\n$_xen_kconfig_debug"
+        _makevars+=(debug=y CONFIG_DEBUG=y)
+    fi
+    if [[ "$_build_livepatch" == true ]]; then
+        _config_xen_kconfig+="\n$_xen_kconfig_livepatch"
+    fi
+    if [[ -n "$_config_xen_kconfig" ]]; then
+        cd xen
+        echo -e "$_config_xen_kconfig" > .config
+        make "${_makevars[@]}" olddefconfig V=1
+        cd ../
+    fi
+    ./configure PYTHON=/usr/bin/python2 --prefix=/usr --sbindir=/usr/bin --with-sysconfig-leaf-dir=conf.d --with-rundir=/run \
+        --enable-systemd --enable-ovmf \
+        "${_config_seabios[@]}" \
+        "${_config_stubdom[@]}" \
+        "${_config_debug[@]}" \
+        --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
+    make "${_makevars[@]}" dist
+    if [[ "$_build_livepatch" == true ]]; then
+        make "${_makevars[@]}" build-tests
     fi
 }
 
-package() {
-    cd "$pkgname-$pkgver/"
+package_xen() {
+    _makevars_package=("${_makevars[@]}" DESTDIR="$pkgdir")
+    optdepends=(
+        'xen-docs: Official Xen documentation'
+        'openvswitch: Optional advanced networking support'
+        'urlgrabber: Required for xenpvnetboot'
+    )
+    conflicts=(xen-{git,rc,igvtg,4.{5,6,7}} xenstore)
+    provides=(xenstore)
+    replaces=(xen-{git,rc,4.{5,6,7}})
+    backup=(
+        etc/conf.d/xen{domains,commons}
+        "etc/$_pkgname/grub.conf"
+        "etc/$_pkgname/oxenstored.conf"
+        "etc/$_pkgname/xl.conf"
+    )
+    install="$_pkgname.install"
+
+    cd "$_pkgname-$_pkgver/"
 
-    make DESTDIR="$pkgdir" LANG=C PYTHON=python2 install
+    make "${_makevars_package[@]}" install-xen
+    make "${_makevars_package[@]}" install-tools
+    if [[ "$_build_stubdom" == true ]]; then
+        make "${_makevars_package[@]}" install-stubdom
+    fi
+    if [[ "$_build_livepatch" == true ]]; then
+        make "${_makevars_package[@]}" install-tests
+    fi
 
     cd "$pkgdir"
 
     # Install files from Parabola 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/tmpfiles.d-$_pkgname.conf" "usr/lib/tmpfiles.d/$_pkgname.conf"
+    install -Dm755 "$srcdir/21_linux_xen_multiboot_arch" etc/grub.d/21_linux_xen_multiboot_arch
     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
+    mkdir -p 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 ../
+        mv lib64/* lib/
+        rmdir lib64
+        cd ../
     fi
 
-    # If EFI binaries build, move to /boot
+    # If EFI binaries built, 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
+        mv usr/lib/efi/*.efi boot/
+        rmdir 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
+    # Remove syms
+    find usr/lib/debug -type f \( -name '*-syms*' -or -name '*\.map' \) -delete
+    rmdir --ignore-fail-on-non-empty usr/lib/debug
 
-    ##### Kill unwanted stuff #####
-    # hypervisor symlinks
-    rm -f boot/xen{,-4,-4.7,-4.7-rc}.gz
+    # Remove hypervisor boot symlinks
+    rm -f boot/xen{,-4{,.8,.9}}{,.{gz,efi}}
 
     # 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-*
+    #rm -rf usr/share/doc
+    #rm -rf usr/share/man
+
+    # Remove tempdirs
+    rmdir run/xen{,stored}
+    rmdir run
+
+    # Remove unnecessary qemu ELF support files
+    # qemuu
+    rm -f usr/share/qemu-xen/qemu/{palcode,openbios,s390}-*
+    rm -f usr/share/qemu-xen/qemu/u-boot.e500
+    # qemut 
+    if [[ "$CARCH" == *'x86'* ]]; then
+        rm -f usr/share/xen/qemu/openbios-*
+    fi
 
     # adhere to Static Library Packaging Guidelines
     rm -rf usr/lib/*.a
 
+    # Remove unneeded init.d files
+    rm -rf etc/init.d
+}
+
+package_xen-docs(){
+    _makevars_package=("${_makevars[@]}" DESTDIR="$pkgdir")
+    pkgdesc='Xen virtual machine hypervisor documentation'
+    arch=('any')
+    depends=()
+    cd "$_pkgname-$_pkgver/"
+    make "${_makevars_package[@]}" install-docs
+}
+
+package_xen-syms(){
+    _makevars_package=("${_makevars[@]}" DESTDIR="$pkgdir")
+    pkgdesc='Xen virtual machine hypervisor debugging symbols'
+    arch=('any')
+    depends=()
+    _installdir="${pkgdir}/usr/lib/debug"
+    cd "$_pkgname-$_pkgver/"
+    install -d -m0755 "$_installdir"
+    for _path in $(find xen -type f \( -name '*-syms' -or -name '*\.map' \)); do
+        _file=$(basename "$_path")
+        _installfile=$(echo "$_file" |
+                       sed "s/\([^.]*\)\(\.*\)/\1-${_pkgver}\2/" )
+        install -D -m0644 -p "$_path" "$_installdir/$_installfile"
+    done
 }