main/xen: fix build with gcc5 and cleanup

3 files changed, 133 insertions, 2 deletions

diff --git a/main/xen/APKBUILD b/main/xen/APKBUILD
index 37145b7efd..97b6b2f0b9 100644
--- a/main/xen/APKBUILD
+++ b/main/xen/APKBUILD
@@ -13,10 +13,20 @@ depends_dev="openssl-dev python-dev e2fsprogs-dev gettext zlib-dev ncurses-dev
 	dev86 texinfo perl iasl pciutils-dev glib-dev yajl-dev
 	spice-dev gnutls-dev curl-dev libaio-dev lzo-dev xz-dev util-linux-dev
 	e2fsprogs-dev linux-headers"
-makedepends="$depends_dev autoconf automake libtool"
+makedepends="$depends_dev autoconf automake libtool seabios-bin"
 install=""
 subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-hypervisor"
 source="http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.gz
+	http://xenbits.xen.org/xen-extfiles/gmp-4.3.2.tar.bz2
+	http://xenbits.xen.org/xen-extfiles/grub-0.97.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/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/tpm_emulator-0.7.4.tar.gz
+	http://xenbits.xen.org/xen-extfiles/zlib-1.2.3.tar.gz
+
 	xsa135-qemut-1.patch
 	xsa135-qemut-2.patch
 
@@ -27,6 +37,8 @@ source="http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.g
 	hotplug-vif-vtrill.patch
 	0001-ipxe-dont-clobber-ebp.patch
 	gnutls-3.4.0.patch
+	gcc5-ipxe.patch
+	gcc5-cflags.patch
 
 	init-xenstore-domain.patch
 
@@ -50,13 +62,22 @@ source="http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.g
 	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
+_seabios=/usr/share/seabios/bios-256k.bin
 prepare() {
 	local i
 	cd "$_builddir"
 
 	for i in $source; do
 		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1
+			;;
+		*/ipxe-git-*)
+			ln -s "$srcdir"/${i##*/} \
+				tools/firmware/etherboot/ipxe.tar.gz || return 1
+			;;
+		*/xen-extfiles/*)
+			ln -s "$srcdir"/${i##*/} stubdom/ || return 1
+			;;
 		esac
 	done
 
@@ -101,6 +122,7 @@ configure() {
 	./configure --prefix=/usr \
 		--build=$CBUILD \
 		--host=$CHOST \
+		--with-system-seabios=$_seabios \
 		|| return 1
 }
 
@@ -188,6 +210,15 @@ hypervisor() {
 }
 
 md5sums="d12dc9e5e8bd22a68b5c7f53119221f1  xen-4.5.1.tar.gz
+dd60683d7057917e34630b4a787932e8  gmp-4.3.2.tar.bz2
+cd3f3eb54446be6003156158d51f4884  grub-0.97.tar.gz
+7496268cebf47d5c9ccb0696e3b26065  ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz
+36cc57650cffda9a0269493be2a169bb  lwip-1.3.0.tar.gz
+bf8f1f9e3ca83d732c00a79a6ef29bc4  newlib-1.16.0.tar.gz
+cec05e7785497c5e19da2f114b934ffd  pciutils-2.2.9.tar.bz2
+7b72caf22b01464ee7d6165f2fd85f44  polarssl-1.1.4-gpl.tgz
+e26becb8a6a2b6695f6b3e8097593db8  tpm_emulator-0.7.4.tar.gz
+debc62758716a169df9f62e6ab2bc634  zlib-1.2.3.tar.gz
 8035908817374d2d32aaadf942e3391d  xsa135-qemut-1.patch
 462f5d784493119bdfa6e7b5a628a88d  xsa135-qemut-2.patch
 de1a3db370b87cfb0bddb51796b50315  qemu-coroutine-gthread.patch
@@ -196,6 +227,8 @@ dd8603eaab5857816843bfc37647d569  qemu-xen-musl-openpty.patch
 e449bb3359b490804ffc7b0ae08d62a0  hotplug-vif-vtrill.patch
 229539a822e14a6a62babffd71ecfbf3  0001-ipxe-dont-clobber-ebp.patch
 a0a0294eccbaef77a2f8f5c2789f011c  gnutls-3.4.0.patch
+80e3861e1a7b2f01bb051e813f9b5a98  gcc5-ipxe.patch
+a0b70cd1190345396d97170bf2d11663  gcc5-cflags.patch
 08a30d56902b660f5102a5c208e545c9  init-xenstore-domain.patch
 0984e3000de17a6d14b8014a3ced46a4  musl-support.patch
 513456607a2adfaa0baf1e3ae5124b23  musl-hvmloader-fix-stdint.patch
@@ -213,6 +246,15 @@ dcdd1de2c29e469e834a02ede4f47806  xendomains.confd
 6a2f777c16678d84039acf670d86fff6  xenqemu.confd
 e1c9e1c83a5cc49224608a48060bd677  xenqemu.initd"
 sha256sums="668c11d4fca67ac44329e369f810356eacd37b28d28fb96e66aac77f3c5e1371  xen-4.5.1.tar.gz
+936162c0312886c21581002b79932829aa048cfaf9937c6265aeaa14f1cd1775  gmp-4.3.2.tar.bz2
+4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b  grub-0.97.tar.gz
+632ce8c193ccacc3012bd354bdb733a4be126f7c098e111930aa41dad537405c  ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz
+772e4d550e07826665ed0528c071dd5404ef7dbe1825a38c8adbc2a00bca948f  lwip-1.3.0.tar.gz
+db426394965c48c1d29023e1cc6d965ea6b9a9035d8a849be2750ca4659a3d07  newlib-1.16.0.tar.gz
+f60ae61cfbd5da1d849d0beaa21f593c38dac9359f0b3ddc612f447408265b24  pciutils-2.2.9.tar.bz2
+2d29fd04a0d0ba29dae6bd29fb418944c08d3916665dcca74afb297ef37584b6  polarssl-1.1.4-gpl.tgz
+4e48ea0d83dd9441cc1af04ab18cd6c961b9fa54d5cbf2c2feee038988dea459  tpm_emulator-0.7.4.tar.gz
+1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e  zlib-1.2.3.tar.gz
 b4b66d772e52ec35f7256b168ac68f5cf0901590112b3b4db860d1b9c2f513f6  xsa135-qemut-1.patch
 0d98a8c4498390a93665872dea9b4b00781578e95e6c78a49632bacb5f70edb8  xsa135-qemut-2.patch
 3941f99b49c7e8dafc9fae8aad2136a14c6d84533cd542cc5f1040a41ef7c6fe  qemu-coroutine-gthread.patch
@@ -221,6 +263,8 @@ e4e5e838e259a3116978aabbcebc1865a895179a7fcbf4bad195c83e9b4c0f98  qemu-xen_paths
 dd1e784bc455eb62cb85b3fa24bfc34f575ceaab9597ef6a2f1ee7ff7b3cae0a  hotplug-vif-vtrill.patch
 751ef06569de66578b8713dc170976832b0671ac2696f32eb9ad69d60332d594  0001-ipxe-dont-clobber-ebp.patch
 e25d38376e22f6f935d2c0ce1b9d6e6b47ff261b5e6056bc3b47168739d7a992  gnutls-3.4.0.patch
+dbd94ef2e8ac3ae63dc7173d3b3de51dca5fb248c55719f3be1a3c371a543f63  gcc5-ipxe.patch
+8226200f17448e20784ad985ffe47aba1e8401364d9a2b6301818ca043f9ec35  gcc5-cflags.patch
 0204d69804e83864cd6b2122f51b9c1940588158a35c159a7ef0c3b8fb0af4cb  init-xenstore-domain.patch
 2fea4ceec8872f5560023fa135e3ff03d6deee4299e53d3a33ec59c31779b2c5  musl-support.patch
 479b9605e85c865be6117b6d1993124dbbb7da7f95d0e896e4c0fe5cdfeb74d3  musl-hvmloader-fix-stdint.patch
@@ -238,6 +282,15 @@ d13719093a2c3824525f36ac91ac3c9bd1154e5ba0974e5441e4a2ab5e883521  xenconsoled.in
 4cfcddcade5d055422ab4543e8caa6e5c5eee7625c41880a9000b7a87c7c424e  xenqemu.confd
 c92bbb1166edd61141fdf678116974209c4422daf373cdd5bc438aa4adb25b8d  xenqemu.initd"
 sha512sums="9436243e26bc64bc836a179abdc3a6b1b6fa9d3f2170453092c18be71fa62e18cd4465a9154c0f28a7ac8d69d08361ba1defef240a51197f058c012c3855ba04  xen-4.5.1.tar.gz
+2e0b0fd23e6f10742a5517981e5171c6e88b0a93c83da701b296f5c0861d72c19782daab589a7eac3f9032152a0fc7eff7f5362db8fccc4859564a9aa82329cf  gmp-4.3.2.tar.bz2
+c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb  grub-0.97.tar.gz
+c5cb1cdff40d2d71fd3e692a9d0efadf2aa17290daf5195391a1c81ddd9dfc913a8e44d5be2b12be85b2a5565ea31631c99c7053564f2fb2225c80ea0bb0e4a4  ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz
+1465b58279af1647f909450e394fe002ca165f0ff4a0254bfa9fe0e64316f50facdde2729d79a4e632565b4500cf4d6c74192ac0dd3bc9fe09129bbd67ba089d  lwip-1.3.0.tar.gz
+40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3  newlib-1.16.0.tar.gz
+2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5  pciutils-2.2.9.tar.bz2
+88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad  polarssl-1.1.4-gpl.tgz
+4928b5b82f57645be9408362706ff2c4d9baa635b21b0d41b1c82930e8c60a759b1ea4fa74d7e6c7cae1b7692d006aa5cb72df0c3b88bf049779aa2b566f9d35  tpm_emulator-0.7.4.tar.gz
+021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e  zlib-1.2.3.tar.gz
 68824ec4d8a201c9687bd2de82489730908a70914243067f9e76a2584ce73212fd55ec00d6cf1301f7d1c73e32c9e46a93d3da4a6a61781ddec4f863190fb02b  xsa135-qemut-1.patch
 c29683569affcef4d45ec510b0b8b6d7c4466fc3026005b0612876ce1b7dc52ead77880a3204b5df78d836bdf197b872780c67afd49a895f9f7a47aabf3d9064  xsa135-qemut-2.patch
 c3c46f232f0bd9f767b232af7e8ce910a6166b126bd5427bb8dc325aeb2c634b956de3fc225cab5af72649070c8205cc8e1cab7689fc266c204f525086f1a562  qemu-coroutine-gthread.patch
@@ -246,6 +299,8 @@ a8b7378516172389450834985e8558d7a86d7cd808154bdc846bb98325e40fc4e87b1fc6d725297f
 f095ea373f36381491ad36f0662fb4f53665031973721256b23166e596318581da7cbb0146d0beb2446729adfdb321e01468e377793f6563a67d68b8b0f7ffe3  hotplug-vif-vtrill.patch
 c3a1b270347a99c8ce21118010ad8d817b4462a31cc5c75352faa7086969ef0646f3f4d0922d85c2e504cff091ce7e9fe79c92f983c2ba4af2fae85c52c3835a  0001-ipxe-dont-clobber-ebp.patch
 e9b88234bd67c2d65fcda1a56deeaf60aaa4c8b2afff128028c6a1478c89f828584dab1ac04f8d9d53cf17d26572e5505d0bbfcc4b2a6842cc749c6c018c0e51  gnutls-3.4.0.patch
+abeef8f4bf410794af63ac3fe0e8a55671111e21701029c6f9af950dd1a24d4933bcd21c8eed86f9d775195d2233996a08015884a37c38e06378110b2a3e93c8  gcc5-ipxe.patch
+68ea6d4798f107fc2fd134c970cd7f7b9aeafe3efaf9501bbd5ec35e7e212f1d637c15c21c7a257c0709c2a2d441f6c6192abad39fd23b3ecba69bcefbb3e930  gcc5-cflags.patch
 475eb800660dc928914b8c15562f18f24d6e7a76f4cc7bed9249ce52d444c29aec1aef843eb37ade0c7c9616195bbbc1606a3195e25b2bd4b6a1d1af5f69256e  init-xenstore-domain.patch
 76bd60768b296752ca11195bb03a57584686461da45255cb540977111a73c42b5b92362fd46d97bfd20487c96971dd5aed7eae7d8bf1aad7d5199adb875d4962  musl-support.patch
 08cf7fac825dd3da5f33856abf6692da00d8928ab73050b3ae0a643ddb97c8ae323238a80152fd31595ac1c31678d559232264258c189e2c05ecaf33e295f13e  musl-hvmloader-fix-stdint.patch
diff --git a/main/xen/gcc5-cflags.patch b/main/xen/gcc5-cflags.patch
new file mode 100644
index 0000000000..d8e0bcdac2
--- /dev/null
+++ b/main/xen/gcc5-cflags.patch
@@ -0,0 +1,21 @@
+gcc5 gives array-bounds warning on xen/common/symbols.c
+     also maybe-uninitialized warning on xen/xsm/flask/ss/policydb.c
+
+--- xen-4.5.0/xen/common/Makefile.orig	2015-01-12 16:53:24.000000000 +0000
++++ xen-4.5.0/xen/common/Makefile	2015-02-14 15:40:29.722759007 +0000
+@@ -72,3 +72,5 @@
+ 
+ subdir-y += libelf
+ subdir-$(HAS_DEVICE_TREE) += libfdt
++
++CFLAGS += -Wno-error=array-bounds
+--- xen-4.5.0/xen/xsm/flask/Makefile.orig	2015-01-12 16:53:24.000000000 +0000
++++ xen-4.5.0/xen/xsm/flask/Makefile	2015-02-14 16:49:54.376183206 +0000
+@@ -5,6 +5,7 @@
+ subdir-y += ss
+ 
+ CFLAGS += -I./include
++CFLAGS += -Wno-error=maybe-uninitialized
+ 
+ AWK = awk
+ 
diff --git a/main/xen/gcc5-ipxe.patch b/main/xen/gcc5-ipxe.patch
new file mode 100644
index 0000000000..1135e765e6
--- /dev/null
+++ b/main/xen/gcc5-ipxe.patch
@@ -0,0 +1,55 @@
+diff --git a/tools/firmware/etherboot/patches/gcc5.patch b/tools/firmware/etherboot/patches/gcc5.patch
+new file mode 100644
+index 0000000..e091f4b
+--- /dev/null
++++ b/tools/firmware/etherboot/patches/gcc5.patch
+@@ -0,0 +1,39 @@
++--- ipxe.orig/src/drivers/net/ath/ath9k/ath9k_ar9003_phy.c	2011-12-11 03:28:04.000000000 +0100

+++++ ipxe/src/drivers/net/ath/ath9k/ath9k_ar9003_phy.c	2015-05-25 10:33:05.576229086 +0200

++@@ -859,7 +859,7 @@

++ 			REG_CLR_BIT(ah, AR_PHY_SFCORR_LOW,

++ 				    AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);

++ 

++-		if (!on != aniState->ofdmWeakSigDetectOff) {

+++		if ((!on) != aniState->ofdmWeakSigDetectOff) {

++ 			DBG2("ath9k: "

++ 				"** ch %d: ofdm weak signal: %s=>%s\n",

++ 				chan->channel,

++@@ -1013,7 +1013,7 @@

++ 			      AR_PHY_MRC_CCK_ENABLE, is_on);

++ 		REG_RMW_FIELD(ah, AR_PHY_MRC_CCK_CTRL,

++ 			      AR_PHY_MRC_CCK_MUX_REG, is_on);

++-		if (!is_on != aniState->mrcCCKOff) {

+++		if ((!is_on) != aniState->mrcCCKOff) {

++ 			DBG2("ath9k: "

++ 				"** ch %d: MRC CCK: %s=>%s\n",

++ 				chan->channel,--- ipxe.orig/src/drivers/net/ath/ath9k/ath9k_ar5008_phy.c	2011-12-11 03:28:04.000000000 +0100

+++++ ipxe/src/drivers/net/ath/ath9k/ath9k_ar5008_phy.c	2015-05-25 11:14:30.732759966 +0200

++@@ -1141,7 +1141,7 @@

++ 			REG_CLR_BIT(ah, AR_PHY_SFCORR_LOW,

++ 				    AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);

++ 

++-		if (!on != aniState->ofdmWeakSigDetectOff) {

+++		if ((!on) != aniState->ofdmWeakSigDetectOff) {

++ 			if (on)

++ 				ah->stats.ast_ani_ofdmon++;

++ 			else

++@@ -1307,7 +1307,7 @@

++ 			REG_CLR_BIT(ah, AR_PHY_SFCORR_LOW,

++ 				    AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);

++ 

++-		if (!on != aniState->ofdmWeakSigDetectOff) {

+++		if ((!on) != aniState->ofdmWeakSigDetectOff) {

++ 			DBG2("ath9k: "

++ 				"** ch %d: ofdm weak signal: %s=>%s\n",

++ 				chan->channel,
+\ No newline at end of file
+diff --git a/tools/firmware/etherboot/patches/series b/tools/firmware/etherboot/patches/series
+index 154e65b..73c9447 100644
+--- a/tools/firmware/etherboot/patches/series
++++ b/tools/firmware/etherboot/patches/series
+@@ -4,3 +4,4 @@ build_fix_2.patch
+ build_fix_3.patch
+ no-clobber-ebp.patch
+ no-clobber-ebp2.patch
++gcc5.patch