summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--kernels/xen/09_xen2
-rw-r--r--kernels/xen/ChangeLog61
-rw-r--r--kernels/xen/PKGBUILD319
-rw-r--r--kernels/xen/efi-xen.cfg6
-rw-r--r--kernels/xen/ovmf-gcc4.9-basetools.patch231
-rw-r--r--kernels/xen/ovmf-gcc4.9-ovmfpkg.patch19
-rw-r--r--kernels/xen/ovmf.patch9
-rw-r--r--kernels/xen/patch-gcc6-etherboot-ath9k-9287-array.patch68
-rw-r--r--kernels/xen/patch-gcc6-etherboot-e1000_phy.c.patch20
-rw-r--r--kernels/xen/patch-gcc6-etherboot-igb_phy.c.patch20
-rw-r--r--kernels/xen/patch-gcc6-etherboot-rm-unused-string-functions.patch257
-rw-r--r--kernels/xen/patch-gcc6-etherboot-via-rhine.c.patch21
-rw-r--r--kernels/xen/patch-gcc6-etherboot-via-velocity.c.patch12
-rw-r--r--kernels/xen/patch-gcc6-ovmf-build.sh.patch12
-rw-r--r--kernels/xen/xen.install23
15 files changed, 716 insertions, 364 deletions
diff --git a/kernels/xen/09_xen b/kernels/xen/09_xen
index c00d1ab96..47d357d99 100644
--- a/kernels/xen/09_xen
+++ b/kernels/xen/09_xen
@@ -6,7 +6,7 @@
## Rebranded for Parabola by "André Silva" <emulatorman@parabola.nu>
## Updated on 08 February 2014
##
-## Script based on do_grub_config() function in Arch Archboot ISO Installer/Setup script
+## Script based on do_grub_config() function in Arch (the GNU/Linux distribution) Archboot ISO Installer/Setup script
## Some parts taken from /etc/grub.d/10_linux script shipped by GRUB(2) upstream
##
## This script can be freely distributed and/or modified
diff --git a/kernels/xen/ChangeLog b/kernels/xen/ChangeLog
index 96bfbfec5..b23e810df 100644
--- a/kernels/xen/ChangeLog
+++ b/kernels/xen/ChangeLog
@@ -1,3 +1,62 @@
+2015-06-24 John Thomson
+ * 4.7.0-1
+ Xen 4.7.0
+
+2015-06-11 John Thomson
+ * 4.6.1-7
+ Apply XSA patch: 175, 178, 181
+
+2015-05-23 John Thomson
+ * 4.6.1-6
+ Apply XSA patch: 180
+
+2015-05-19 John Thomson
+ * 4.6.1-5
+ Apply XSA patch: 176
+
+2016-05-12 John Thomson
+ * 4.6.1-4
+ Apply XSA patch: 179
+ Patches for GCC6
+
+2016-04-19 John Thomson
+ * 4.6.1-3
+ Apply XSA patch: 173
+
+2016-03-31 John Thomson
+ * 4.6.1-2
+ Apply XSA patch: 172
+
+2016-02-19 John Thomson
+ * 4.6.1-1
+ Xen source package updated to 4.6.1
+ Apply XSA patch: 170
+
+2016-02-19 John Thomson
+ * 4.5.2-1
+ Xen source package updated to 4.5.2
+ Build xen.efi with mingw-w64-binutils
+ Build ovmf
+ Apply XSA patches: 154, 156, 158 to 160, 162 to 168, and 170
+
+2015-07-04 David Sutton <kantras - gmail.com>
+ * 4.5.1-1
+ New major release from upstream
+ Added -fno-caller-saves CFLAG to PKGBUILD to work around GCC5 issues
+ Added in some compile fixes for GCC 5
+ Disabled OVMF for now until patched for GCC 5
+
+2015-05-13 David Sutton <kantras - gmail.com>
+ * 4.5.0-3
+ Added Security patches
+
+2015-04-08 David Sutton <kantras - gmail.com>
+ * 4.5.0-2
+ Updated PKGBUILD to use absolute instead of relative paths for install
+ Updated efi-xen.cfg with syntax fix
+ Added gnuttls-3.4.0 patch
+ Added security patches
+
2015-03-01 David Sutton <kantras - gmail.com>
* 4.5.0-1
New major release from upstream
@@ -102,7 +161,7 @@
* 4.3.0-3 :
added ChangeLog.
- Cleaned up PKGBUILD to match Parabola Package Standards
+ Cleaned up PKGBUILD to match Arch Package Standards
Fixed some path references - /var/run to /run
Removed some unnecessary empty directories
Updated xenconsoled and xenstored so they use /run for pid file
diff --git a/kernels/xen/PKGBUILD b/kernels/xen/PKGBUILD
index 0518ce19c..af74ce999 100644
--- a/kernels/xen/PKGBUILD
+++ b/kernels/xen/PKGBUILD
@@ -3,58 +3,168 @@
# Contributor (Arch): Limao Luo
# Contributor (Arch): Luceo
# Contributor (Arch): Revellion
+# Contributor (Arch): John Thomson
# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Márcio Silva <coadde@parabola.nu>
+
+
+_build_stubdom=${build_stubdom:-false}
+## use _build_stubdom=true to build xen with stubdom
+#_build_stubdom=true
pkgname=xen
-pkgver=4.5.0
+pkgver=4.7.0
pkgrel=1.parabola1
pkgdesc="Virtual Machine Hypervisor & Tools (Parabola rebranded)"
-arch=(i686 x86_64)
+arch=(x86_64)
url="http://www.xenproject.org/"
license=(GPL2)
-depends=(bridge-utils curl gnutls iproute2 libaio libcap-ng libiscsi libjpeg-turbo libpng libseccomp lzo2 nss pixman pciutils python python2 sdl yajl spice usbredir)
+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 git iasl markdown ocaml-findlib figlet wget spice-protocol)
+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)
+_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} xen-4.3{,-testing-hg})
-backup=(etc/modules-load.d/$pkgname.conf etc/$pkgname/xl.conf etc/conf.d/xen{stored,consoled,domains,commons} etc/$pkgname/grub.conf)
+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
+ )
options=(!buildflags !strip)
install=$pkgname.install
changelog=ChangeLog
-source=(http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.gz
+source=(
+ http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.gz
http://xenbits.xen.org/xen-extfiles/ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz
- 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://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.gz
- xen.install
- tmpfiles.d-$pkgname.conf
- 09_xen
+
+ ##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'
+ ##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'
+
+ ## Compile patches
ati-passthrough.patch
ovmf.patch
- ovmf-gcc4.9-basetools.patch
- ovmf-gcc4.9-ovmfpkg.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)
-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
+ $pkgname.conf
+ tmpfiles.d-$pkgname.conf
+
+ ## XSA patches
+ )
+
+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
+ )
+fi
+
+
+noextract=(
ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz
- $pkgname-$pkgver.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
+ )
+fi
-sha256sums=('5bdb40e2b28d2eeb541bd71a9777f40cbe2ae444b987521d33f099541a006f3b'
+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
+ sha256sums+=(
+ #stubdom bits
'772e4d550e07826665ed0528c071dd5404ef7dbe1825a38c8adbc2a00bca948f'
'1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e'
'db426394965c48c1d29023e1cc6d965ea6b9a9035d8a849be2750ca4659a3d07'
@@ -63,84 +173,125 @@ sha256sums=('5bdb40e2b28d2eeb541bd71a9777f40cbe2ae444b987521d33f099541a006f3b'
'4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b'
'4e48ea0d83dd9441cc1af04ab18cd6c961b9fa54d5cbf2c2feee038988dea459'
'936162c0312886c21581002b79932829aa048cfaf9937c6265aeaa14f1cd1775'
- 'bf636b3cbe01a3a8f348656c64ca08bdcbe6be602b53826952de22b90747f5e3'
- 'bfee0c85c88fe331ad76cdc07b93b18da24c6c1ff2ea3f6f28ee727f8e3ee121'
- '40e0760810a49f925f2ae9f986940b40eba477dc6d3e83a78baaae096513b3cf'
- 'b0a3cfe2d524371ee04a26a29ad04cd9f3dae8c5d4a18b6b41576c6c7547f946'
- 'd93c2d5bcdf0c3e4c6e8efb357cb4b9d618209025361f5ccd9d03651a8acd7a3'
- '1c44b9dc848bb6c3ef2ab76e4807a0b3ed360aea6b13b5b86d2bf5301d14247b'
- '45aae7a1d48357e5f981c12870b5bcac0dd0f630f84e398160d8c9adb42a6674'
- '8e16638d0cc366d1eaae7ccbcf43215853b4444a625478ec8f6e0a2c655370d9'
- '592f9ed540adbe94095071e4c327aefe85ee5ca057a086a9935847f36aca3be8'
- '3f0af16958c3e057b9baa5afc47050d9adf7dd553274dd97ae4f35938fefb568'
- '50a9b7fd19e8beb1dea09755f07318f36be0b7ec53d3c9e74f3266a63e682c0c')
+ #'ecdd4f8473ab0dee5d3acb5c0a31a4c1dd6aa12179895cf1903dd0f455c43a4f'
+
+ #stubdom patches
+ )
+fi
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/
### Patching
- # Security Patches
+ # Security Patches - Base
+
+ # Security Patches - qemu-xen-traditional
+ cd 'tools/qemu-xen-traditional/'
+ cd '../../'
+
+ # Security Patches - qemu-xen (upstream)
+ cd 'tools/qemu-xen/'
+ cd '../../'
# 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)
- echo "Patching OVMF..."
- patch -Np1 -i $srcdir/ovmf.patch
- cp $srcdir/ovmf-gcc4.9-basetools.patch tools/firmware/
- cp $srcdir/ovmf-gcc4.9-ovmfpkg.patch tools/firmware/
+ 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 ../ati-passthrough.patch
+ #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
+ ## 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
- # 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/ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz tools/firmware/etherboot/ipxe.tar.gz
+ 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
+
}
build() {
- cd $pkgname-$pkgver/
+ 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-stubdom --enable-qemu-traditional --enable-rombios \
- --with-extra-qemuu-configure-args="--disable-bluez --disable-gtk --enable-spice --enable-usb-redir" # --enable-ovmf
- unset CFLAGS
- make LANG=C PYTHON=python2
+ --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
}
package() {
- cd $pkgname-$pkgver/
+ cd "$pkgname-$pkgver/"
make DESTDIR="$pkgdir" LANG=C PYTHON=python2 install
cd "$pkgdir"
# Install files from Parabola package
- install -Dm644 $srcdir/tmpfiles.d-$pkgname.conf usr/lib/tmpfiles.d/$pkgname.conf
- #install -Dm644 $srcdir/conf.d-xenstored etc/conf.d/xenstored
- #install -Dm644 $srcdir/conf.d-xenconsoled etc/conf.d/xenconsoled
- 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 bug #678 -> https://labs.parabola.nu/issues/678
- if [[ $CARCH == i686 ]]; then
- mkdir boot
- cp $srcdir/$pkgname-$pkgver.gz boot
- fi
+ 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
@@ -167,16 +318,12 @@ package() {
fi
# Compress syms file and move to a share location
- if [[ $CARCH == x86_64 ]]; then
- gzip boot/$pkgname-syms-*
- mv boot/$pkgname-syms-*.gz usr/share/xen
- fi
+ #gzip boot/$pkgname-syms-*
+ #mv boot/$pkgname-syms-*.gz usr/share/xen
##### Kill unwanted stuff #####
# hypervisor symlinks
- if [[ $CARCH == x86_64 ]]; then
- rm -f boot/xen{,-4,-4.5,-4.5-rc}.gz
- fi
+ rm -f boot/xen{,-4,-4.7,-4.7-rc}.gz
# Documentation cleanup ( see xen-docs package )
rm -rf usr/share/doc
diff --git a/kernels/xen/efi-xen.cfg b/kernels/xen/efi-xen.cfg
index 0d4048fda..3c8e4d04c 100644
--- a/kernels/xen/efi-xen.cfg
+++ b/kernels/xen/efi-xen.cfg
@@ -2,6 +2,6 @@
default=xen
[xen]
-options=console=vga dom0_mem=1024M,max=1024M dom0_max_vcpus=4 loglvl=all noreboot
-kernel=vmlinuz-linux root=<Root Device> rw
-ramdisk=initramfs-linux.img
+options=console=vga dom0_mem=1024M,max:1024M dom0_max_vcpus=4 loglvl=all noreboot
+kernel=vmlinuz-linux-libre root=<Root Device> rw
+ramdisk=initramfs-linux-libre.img
diff --git a/kernels/xen/ovmf-gcc4.9-basetools.patch b/kernels/xen/ovmf-gcc4.9-basetools.patch
deleted file mode 100644
index 7af48e8ac..000000000
--- a/kernels/xen/ovmf-gcc4.9-basetools.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
-index f99ddf6..f9e1e6c 100644
---- a/ovmf-dir/BaseTools/Conf/tools_def.template
-+++ b/ovmf-dir/BaseTools/Conf/tools_def.template
-@@ -159,6 +159,12 @@
- DEFINE GCC47_IA32_PREFIX = /usr/bin/
- DEFINE GCC47_X64_PREFIX = /usr/bin/
-
-+DEFINE GCC48_IA32_PREFIX = /usr/bin/
-+DEFINE GCC48_X64_PREFIX = /usr/bin/
-+
-+DEFINE GCC49_IA32_PREFIX = /usr/bin/
-+DEFINE GCC49_X64_PREFIX = /usr/bin/
-+
- DEFINE UNIX_IASL_BIN = /usr/bin/iasl
- #DEFINE UNIX_IASL_BIN = $(HOME)/programs/iasl
- DEFINE WIN_ASL_BIN_DIR = C:\ASL
-@@ -307,6 +310,12 @@ DEFINE SOURCERY_CYGWIN_TOOLS = /cygdrive/c/Program Files/CodeSourcery/Sourcery G
- # Required to build platforms or ACPI tables:
- # Intel(r) ACPI Compiler v20101013 from
- # http://www.acpica.org/downloads/previous_releases.php
-+# GCC49 -Linux- Requires:
-+# GCC 4.9
-+# Optional:
-+# Required to build platforms or ACPI tables:
-+# Intel(r) ACPI Compiler v20101013 from
-+# http://www.acpica.org/downloads/previous_releases.php
- # ELFGCC -Linux- Requires:
- # GCC(this tool chain uses whatever version of gcc and binutils that is installed in /usr/bin)
- # Optional:
-@@ -3216,6 +3225,23 @@ DEFINE GCC48_AARCH64_DLINK_FLAGS = DEF(GCC_ARM_AARCH64_DLINK_COMMON)
- DEFINE GCC48_ARM_ASLDLINK_FLAGS = DEF(GCC47_ARM_ASLDLINK_FLAGS)
- DEFINE GCC48_AARCH64_ASLDLINK_FLAGS = DEF(GCC_ARM_AARCH64_ASLDLINK_FLAGS)
-
-+DEFINE GCC_ARM_AARCH64_ASLDLINK_FLAGS = DEF(GCC_ARM_AARCH64_DLINK_COMMON) --entry ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT)
-+DEFINE GCC49_IA32_CC_FLAGS = DEF(GCC47_IA32_CC_FLAGS)
-+DEFINE GCC49_X64_CC_FLAGS = DEF(GCC47_X64_CC_FLAGS)
-+DEFINE GCC49_IA32_X64_DLINK_COMMON = -nostdlib -n -q --gc-sections --script=$(EDK_TOOLS_PATH)/Scripts/gcc4.9-ld-script
-+DEFINE GCC49_IA32_X64_ASLDLINK_FLAGS = DEF(GCC49_IA32_X64_DLINK_COMMON) --entry ReferenceAcpiTable -u ReferenceAcpiTable
-+DEFINE GCC49_IA32_X64_DLINK_FLAGS = DEF(GCC49_IA32_X64_DLINK_COMMON) --entry $(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
-+DEFINE GCC49_X64_DLINK_FLAGS = DEF(GCC49_IA32_X64_DLINK_FLAGS) -melf_x86_64 --oformat=elf64-x86-64
-+DEFINE GCC49_ASM_FLAGS = DEF(GCC47_ASM_FLAGS)
-+DEFINE GCC49_ARM_ASM_FLAGS = DEF(GCC47_ARM_ASM_FLAGS)
-+DEFINE GCC49_AARCH64_ASM_FLAGS = DEF(GCC47_AARCH64_ASM_FLAGS)
-+DEFINE GCC49_ARM_CC_FLAGS = DEF(GCC47_ARM_CC_FLAGS)
-+DEFINE GCC49_AARCH64_CC_FLAGS = DEF(GCC47_AARCH64_CC_FLAGS)
-+DEFINE GCC49_ARM_DLINK_FLAGS = DEF(GCC47_ARM_DLINK_FLAGS)
-+DEFINE GCC49_AARCH64_DLINK_FLAGS = DEF(GCC_ARM_AARCH64_DLINK_COMMON)
-+DEFINE GCC49_ARM_ASLDLINK_FLAGS = DEF(GCC_ARM_AARCH64_ASLDLINK_FLAGS) --oformat=elf32-littlearm
-+DEFINE GCC49_AARCH64_ASLDLINK_FLAGS = DEF(GCC_ARM_AARCH64_ASLDLINK_FLAGS)
-+
- ####################################################################################
- #
- # Unix GCC And Intel Linux ACPI Compiler
-@@ -3769,6 +3794,126 @@ RELEASE_GCC48_AARCH64_CC_FLAGS = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s
-
- ####################################################################################
- #
-+# GCC 4.9 - This configuration is used to compile under Linux to produce
-+# PE/COFF binaries using GCC 4.9.
-+#
-+####################################################################################
-+*_GCC49_*_*_FAMILY = GCC
-+
-+*_GCC49_*_MAKE_PATH = make
-+*_GCC49_*_ASL_PATH = DEF(UNIX_IASL_BIN)
-+
-+*_GCC49_*_PP_FLAGS = DEF(GCC_PP_FLAGS)
-+*_GCC49_*_ASLPP_FLAGS = DEF(GCC_ASLPP_FLAGS)
-+*_GCC49_*_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS)
-+*_GCC49_*_VFRPP_FLAGS = DEF(GCC_VFRPP_FLAGS)
-+*_GCC49_*_APP_FLAGS =
-+*_GCC49_*_ASL_FLAGS = DEF(IASL_FLAGS)
-+*_GCC49_*_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS)
-+
-+##################
-+# GCC49 IA32 definitions
-+##################
-+*_GCC49_IA32_OBJCOPY_PATH = DEF(GCC49_IA32_PREFIX)objcopy
-+*_GCC49_IA32_CC_PATH = DEF(GCC49_IA32_PREFIX)gcc
-+*_GCC49_IA32_SLINK_PATH = DEF(GCC49_IA32_PREFIX)ar
-+*_GCC49_IA32_DLINK_PATH = DEF(GCC49_IA32_PREFIX)ld
-+*_GCC49_IA32_ASLDLINK_PATH = DEF(GCC49_IA32_PREFIX)ld
-+*_GCC49_IA32_ASM_PATH = DEF(GCC49_IA32_PREFIX)gcc
-+*_GCC49_IA32_PP_PATH = DEF(GCC49_IA32_PREFIX)gcc
-+*_GCC49_IA32_VFRPP_PATH = DEF(GCC49_IA32_PREFIX)gcc
-+*_GCC49_IA32_ASLCC_PATH = DEF(GCC49_IA32_PREFIX)gcc
-+*_GCC49_IA32_ASLPP_PATH = DEF(GCC49_IA32_PREFIX)gcc
-+*_GCC49_IA32_RC_PATH = DEF(GCC49_IA32_PREFIX)objcopy
-+
-+*_GCC49_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32
-+*_GCC49_IA32_ASLDLINK_FLAGS = DEF(GCC49_IA32_X64_ASLDLINK_FLAGS) -m elf_i386
-+*_GCC49_IA32_ASM_FLAGS = DEF(GCC49_ASM_FLAGS) -m32 -march=i386
-+*_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Os
-+*_GCC49_IA32_DLINK_FLAGS = DEF(GCC49_IA32_X64_DLINK_FLAGS) -m elf_i386 --oformat=elf32-i386
-+*_GCC49_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS)
-+*_GCC49_IA32_OBJCOPY_FLAGS =
-+
-+##################
-+# GCC49 X64 definitions
-+##################
-+*_GCC49_X64_OBJCOPY_PATH = DEF(GCC49_X64_PREFIX)objcopy
-+*_GCC49_X64_CC_PATH = DEF(GCC49_X64_PREFIX)gcc
-+*_GCC49_X64_SLINK_PATH = DEF(GCC49_X64_PREFIX)ar
-+*_GCC49_X64_DLINK_PATH = DEF(GCC49_X64_PREFIX)ld
-+*_GCC49_X64_ASLDLINK_PATH = DEF(GCC49_X64_PREFIX)ld
-+*_GCC49_X64_ASM_PATH = DEF(GCC49_X64_PREFIX)gcc
-+*_GCC49_X64_PP_PATH = DEF(GCC49_X64_PREFIX)gcc
-+*_GCC49_X64_VFRPP_PATH = DEF(GCC49_X64_PREFIX)gcc
-+*_GCC49_X64_ASLCC_PATH = DEF(GCC49_X64_PREFIX)gcc
-+*_GCC49_X64_ASLPP_PATH = DEF(GCC49_X64_PREFIX)gcc
-+*_GCC49_X64_RC_PATH = DEF(GCC49_X64_PREFIX)objcopy
-+
-+*_GCC49_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64
-+*_GCC49_X64_ASLDLINK_FLAGS = DEF(GCC49_IA32_X64_ASLDLINK_FLAGS) -m elf_x86_64
-+*_GCC49_X64_ASM_FLAGS = DEF(GCC49_ASM_FLAGS) -m64
-+*_GCC49_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS)
-+*_GCC49_X64_DLINK_FLAGS = DEF(GCC49_X64_DLINK_FLAGS)
-+*_GCC49_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS)
-+*_GCC49_X64_OBJCOPY_FLAGS =
-+
-+##################
-+# GCC49 ARM definitions
-+##################
-+*_GCC49_ARM_CC_PATH = ENV(GCC49_ARM_PREFIX)gcc
-+*_GCC49_ARM_SLINK_PATH = ENV(GCC49_ARM_PREFIX)ar
-+*_GCC49_ARM_DLINK_PATH = ENV(GCC49_ARM_PREFIX)ld
-+*_GCC49_ARM_ASLDLINK_PATH = ENV(GCC49_ARM_PREFIX)ld
-+*_GCC49_ARM_ASM_PATH = ENV(GCC49_ARM_PREFIX)gcc
-+*_GCC49_ARM_PP_PATH = ENV(GCC49_ARM_PREFIX)gcc
-+*_GCC49_ARM_VFRPP_PATH = ENV(GCC49_ARM_PREFIX)gcc
-+*_GCC49_ARM_ASLCC_PATH = ENV(GCC49_ARM_PREFIX)gcc
-+*_GCC49_ARM_ASLPP_PATH = ENV(GCC49_ARM_PREFIX)gcc
-+*_GCC49_ARM_RC_PATH = ENV(GCC49_ARM_PREFIX)objcopy
-+
-+*_GCC49_ARM_ARCHCC_FLAGS = -mthumb
-+*_GCC49_ARM_PLATFORM_FLAGS = -march=armv7-a
-+
-+*_GCC49_ARM_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS)
-+*_GCC49_ARM_ASLDLINK_FLAGS = DEF(GCC49_ARM_ASLDLINK_FLAGS)
-+*_GCC49_ARM_ASM_FLAGS = DEF(GCC49_ARM_ASM_FLAGS)
-+*_GCC49_ARM_DLINK_FLAGS = DEF(GCC49_ARM_DLINK_FLAGS)
-+*_GCC49_ARM_PLATFORM_FLAGS = -march=armv7-a
-+*_GCC49_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_PP_FLAGS)
-+*_GCC49_ARM_RC_FLAGS = DEF(GCC_ARM_RC_FLAGS)
-+*_GCC49_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_VFRPP_FLAGS)
-+
-+ DEBUG_GCC49_ARM_CC_FLAGS = DEF(GCC49_ARM_CC_FLAGS) -O0
-+RELEASE_GCC49_ARM_CC_FLAGS = DEF(GCC49_ARM_CC_FLAGS) -Wno-unused-but-set-variable
-+
-+##################
-+# GCC49 AARCH64 definitions
-+##################
-+*_GCC49_AARCH64_CC_PATH = ENV(GCC49_AARCH64_PREFIX)gcc
-+*_GCC49_AARCH64_SLINK_PATH = ENV(GCC49_AARCH64_PREFIX)ar
-+*_GCC49_AARCH64_DLINK_PATH = ENV(GCC49_AARCH64_PREFIX)ld
-+*_GCC49_AARCH64_ASLDLINK_PATH = ENV(GCC49_AARCH64_PREFIX)ld
-+*_GCC49_AARCH64_ASM_PATH = ENV(GCC49_AARCH64_PREFIX)gcc
-+*_GCC49_AARCH64_PP_PATH = ENV(GCC49_AARCH64_PREFIX)gcc
-+*_GCC49_AARCH64_VFRPP_PATH = ENV(GCC49_AARCH64_PREFIX)gcc
-+*_GCC49_AARCH64_ASLCC_PATH = ENV(GCC49_AARCH64_PREFIX)gcc
-+*_GCC49_AARCH64_ASLPP_PATH = ENV(GCC49_AARCH64_PREFIX)gcc
-+*_GCC49_AARCH64_RC_PATH = ENV(GCC49_AARCH64_PREFIX)objcopy
-+
-+*_GCC49_AARCH64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS)
-+*_GCC49_AARCH64_ASLDLINK_FLAGS = DEF(GCC49_AARCH64_ASLDLINK_FLAGS)
-+*_GCC49_AARCH64_ASM_FLAGS = DEF(GCC49_AARCH64_ASM_FLAGS)
-+*_GCC49_AARCH64_DLINK_FLAGS = DEF(GCC49_AARCH64_DLINK_FLAGS)
-+*_GCC49_AARCH64_PLATFORM_FLAGS =
-+*_GCC49_AARCH64_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_PP_FLAGS)
-+*_GCC49_AARCH64_RC_FLAGS = DEF(GCC_AARCH64_RC_FLAGS)
-+*_GCC49_AARCH64_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_VFRPP_FLAGS)
-+
-+ DEBUG_GCC49_AARCH64_CC_FLAGS = DEF(GCC49_AARCH64_CC_FLAGS) -O0
-+RELEASE_GCC49_AARCH64_CC_FLAGS = DEF(GCC49_AARCH64_CC_FLAGS) -Wno-unused-but-set-variable
-+
-+####################################################################################
-+#
- # Cygwin GCC And Intel ACPI Compiler
- #
- ####################################################################################
-diff --git a/BaseTools/Scripts/gcc4.9-ld-script b/BaseTools/Scripts/gcc4.9-ld-script
-new file mode 100644
-index 0000000..b692328
---- /dev/null
-+++ b/ovmf-dir/BaseTools/Scripts/gcc4.9-ld-script
-@@ -0,0 +1,44 @@
-+/* OUTPUT_FORMAT(efi-bsdrv-x86_64) */
-+SECTIONS
-+{
-+ /* . = 0 + SIZEOF_HEADERS; */
-+ . = 0x280;
-+ .text ALIGN(0x20) :
-+ {
-+ *(.text .stub .text.* .gnu.linkonce.t.*)
-+ . = ALIGN(0x20);
-+ } =0x90909090
-+ .data ALIGN(0x40) :
-+ {
-+ *(
-+ .rodata .rodata.* .gnu.linkonce.r.*
-+ .data .data.* .gnu.linkonce.d.*
-+ .bss .bss.*
-+ *COM*
-+ )
-+ . = ALIGN(0x20);
-+ }
-+ .eh_frame ALIGN(0x20) :
-+ {
-+ KEEP (*(.eh_frame))
-+ }
-+ .got ALIGN(0x20) :
-+ {
-+ *(.got .got.*)
-+ . = ALIGN(0x20);
-+ }
-+ .rela ALIGN(0x20) :
-+ {
-+ *(.rela .rela.*)
-+ }
-+ /DISCARD/ : {
-+ *(.note.GNU-stack) *(.gnu_debuglink)
-+ *(.interp)
-+ *(.dynsym)
-+ *(.dynstr)
-+ *(.dynamic)
-+ *(.hash)
-+ *(.comment)
-+ }
-+}
-+
diff --git a/kernels/xen/ovmf-gcc4.9-ovmfpkg.patch b/kernels/xen/ovmf-gcc4.9-ovmfpkg.patch
deleted file mode 100644
index b060d3e48..000000000
--- a/kernels/xen/ovmf-gcc4.9-ovmfpkg.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/ovmf-dir/OvmfPkg/build.sh
-+++ b/ovmf-dir/OvmfPkg/build.sh
-@@ -82,9 +82,15 @@
- 4.6.*)
- TARGET_TOOLS=GCC46
- ;;
-- 4.[789].*)
-+ 4.7.*)
- TARGET_TOOLS=GCC47
- ;;
-+ 4.8.*)
-+ TARGET_TOOLS=GCC48
-+ ;;
-+ 4.9.*|4.1[0-9].*)
-+ TARGET_TOOLS=GCC49
-+ ;;
- *)
- TARGET_TOOLS=GCC44
- ;;
diff --git a/kernels/xen/ovmf.patch b/kernels/xen/ovmf.patch
index a31b89608..19ad7d326 100644
--- a/kernels/xen/ovmf.patch
+++ b/kernels/xen/ovmf.patch
@@ -1,13 +1,12 @@
---- a/tools/firmware/Makefile 2014-10-26 23:26:08.002103548 -0500
-+++ b/tools/firmware/Makefile 2014-10-26 23:25:50.112361448 -0500
-@@ -19,6 +19,10 @@
+--- a/tools/firmware/Makefile
++++ b/tools/firmware/Makefile
+@@ -19,6 +19,9 @@
ovmf-dir:
GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(OVMF_UPSTREAM_URL) $(OVMF_UPSTREAM_REVISION) ovmf-dir
+ sed 's|python |python2 |g' -i "ovmf-dir/BaseTools/BinWrappers/PosixLike"/* || true
+ sed 's|python |python2 |g' -i "ovmf-dir/BaseTools/Tests/GNUmakefile"
-+ patch -Np1 -i ovmf-gcc4.9-basetools.patch
-+ patch -Np1 -i ovmf-gcc4.9-ovmfpkg.patch
++ patch -Np1 -i patch-gcc6-ovmf-build.sh.patch
cp ovmf-makefile ovmf-dir/Makefile;
seabios-dir:
diff --git a/kernels/xen/patch-gcc6-etherboot-ath9k-9287-array.patch b/kernels/xen/patch-gcc6-etherboot-ath9k-9287-array.patch
new file mode 100644
index 000000000..7b1f369b1
--- /dev/null
+++ b/kernels/xen/patch-gcc6-etherboot-ath9k-9287-array.patch
@@ -0,0 +1,68 @@
+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/kernels/xen/patch-gcc6-etherboot-e1000_phy.c.patch b/kernels/xen/patch-gcc6-etherboot-e1000_phy.c.patch
new file mode 100644
index 000000000..4cd6c246c
--- /dev/null
+++ b/kernels/xen/patch-gcc6-etherboot-e1000_phy.c.patch
@@ -0,0 +1,20 @@
+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/kernels/xen/patch-gcc6-etherboot-igb_phy.c.patch b/kernels/xen/patch-gcc6-etherboot-igb_phy.c.patch
new file mode 100644
index 000000000..44beb4baa
--- /dev/null
+++ b/kernels/xen/patch-gcc6-etherboot-igb_phy.c.patch
@@ -0,0 +1,20 @@
+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/kernels/xen/patch-gcc6-etherboot-rm-unused-string-functions.patch b/kernels/xen/patch-gcc6-etherboot-rm-unused-string-functions.patch
new file mode 100644
index 000000000..991d43330
--- /dev/null
+++ b/kernels/xen/patch-gcc6-etherboot-rm-unused-string-functions.patch
@@ -0,0 +1,257 @@
+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/kernels/xen/patch-gcc6-etherboot-via-rhine.c.patch b/kernels/xen/patch-gcc6-etherboot-via-rhine.c.patch
new file mode 100644
index 000000000..697208ae3
--- /dev/null
+++ b/kernels/xen/patch-gcc6-etherboot-via-rhine.c.patch
@@ -0,0 +1,21 @@
+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/kernels/xen/patch-gcc6-etherboot-via-velocity.c.patch b/kernels/xen/patch-gcc6-etherboot-via-velocity.c.patch
new file mode 100644
index 000000000..36a3d8115
--- /dev/null
+++ b/kernels/xen/patch-gcc6-etherboot-via-velocity.c.patch
@@ -0,0 +1,12 @@
+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/kernels/xen/patch-gcc6-ovmf-build.sh.patch b/kernels/xen/patch-gcc6-ovmf-build.sh.patch
new file mode 100644
index 000000000..3da5e1c32
--- /dev/null
+++ b/kernels/xen/patch-gcc6-ovmf-build.sh.patch
@@ -0,0 +1,12 @@
+diff -aur a/ovmf-dir/OvmfPkg/build.sh b/ovmf-dir/OvmfPkg/build.sh
+--- a/ovmf-dir/OvmfPkg/build.sh 2016-05-12 12:32:47.417562962 +1000
++++ b/ovmf-dir/OvmfPkg/build.sh 2016-05-12 12:32:06.440897741 +1000
+@@ -95,7 +95,7 @@
+ 4.8.*)
+ TARGET_TOOLS=GCC48
+ ;;
+- 4.9.*|4.1[0-9].*|5.*.*)
++ 4.9.*|4.1[0-9].*|5.*.*|6.*.*)
+ TARGET_TOOLS=GCC49
+ ;;
+ *)
diff --git a/kernels/xen/xen.install b/kernels/xen/xen.install
index 173e6437f..f48de62f8 100644
--- a/kernels/xen/xen.install
+++ b/kernels/xen/xen.install
@@ -32,24 +32,11 @@ __EOF__
upgrade_msg() {
cat << __EOF__
-
-Note: If you are upgrading from one of the previous 4.2 xen builds, and are having issues
- with graphics card passthrough, the default device model used has changed and the
- newer model can sometimes have issues. To work around these issue, support for the
- old style qemu-xen-traditional device model has been enabled. To use, add (or change)
- the following line into the configuration file for the domain you want to use
- passthrough with:
- device_model_version = "qemu-xen-traditional"
-
- Also remember to rebuild your grub configuration if upgrading from a non-xen 4.5.0
- install.
-
- The xend daemon and the xm toolset have now been removed with the xen 4.5 release.
-
- This install is now using a new version of the 09_xen file, used when generating
- a new grub.cfg file. The new version inherits the default linux-libre kernel command
- line settings; to use the old method, uncomment the 'XEN_LINUX_CMDLINE_OVERRIDE'
- option in /etc/xen/grub.conf and change the '0' to '1'
+Xen 4.7
+Release notes
+http://wiki.xen.org/wiki/Xen_Project_4.7_Release_Notes
+Feature list
+http://wiki.xen.org/wiki/Xen_Project_4.7_Feature_List
__EOF__
}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-02 10:23:29 +0000