Merge git://dev.alpinelinux.org/aports

1 files changed, 40 insertions, 46 deletions

diff --git a/main/xen/APKBUILD b/main/xen/APKBUILD
index b427fbd374..0fe61ee06d 100644
--- a/main/xen/APKBUILD
+++ b/main/xen/APKBUILD
@@ -1,70 +1,67 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
+# Contributor: Roger Pau Monne <roger.pau@entel.upc.edu>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=xen
-pkgver=4.1.1
-pkgrel=2
+pkgver=4.1.2
+pkgrel=3
 pkgdesc="Xen hypervisor"
 url="http://www.xen.org/"
+arch="x86 x86_64"
 license="GPL"
-depends="coreutils python sed gawk"
-makedepends="libgcrypt-dev gnutls-dev pciutils-dev texinfo wget mesa-dev sdl-dev zlib-dev openssl-dev util-linux-dev python-dev gettext-dev ncurses-dev perl"
-install=
+depends="udev syslinux bash"
+depends_dev="openssl-dev python-dev e2fsprogs-dev gettext zlib-dev ncurses-dev
+	libiconv-dev dev86 texinfo perl iasl pciutils-dev"
+makedepends="$depends_dev"
+install=""
 subpackages="$pkgname-doc"
 source="http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.gz
-	xen-blktap-uclibc.patch
-	xen-blktap2-uclibc.patch
-	xen-disable-firmware.patch
-	xen-dont-use-lib64.patch
-	xen-sed-is-broken-hack.patch
-	blktap-write.patch
-	xen-x86-pic.patch
-	xen-gcc-4.6-Werror-fix.patch
-	xen-gcc-4.6-hvmloader-is-broken.patch
+	blktap2_libvhd_add_iconv.patch
+	detect_libiconv.patch
+	fix_bswap_blktap.patch
+	fix_bswap_blktap2.patch
+	fix_ipxe_no_pie_default.patch
+	define_fsimage_dir.patch
+	pygrub_alpine.patch
+	librt.patch
+	busybox-sed.patch
 	xencommons.initd
 	xend.initd
 	xendomains.initd"
-arch="x86 x86_64"
 
 _builddir="$srcdir"/$pkgname-$pkgver
-
 prepare() {
+	local i
 	cd "$_builddir"
-
-	msg "Patching sources..."
 	for i in $source; do
 		case $i in
-		*.patch)
-			msg "Applying $i..."
-			patch -s -p1 -N -i "$srcdir"/$i || return 1
-			;;
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
 		esac
 	done
-	msg "Sources have been patched successfully."
 
 	# remove all -Werror
 	msg "Eradicating -Werror..."
 	find -name '*.mk' -o -name 'Make*' | xargs sed -i -e 's/-Werror//g'
+
+	echo "LIBLEAFDIR_x86_64=lib" >> .config
 }
 
 build() {
 	cd "$_builddir"
 
-	# We unset $CFLAGS and $LDFLAGS because Xen's buildsystem does not
-	# like these values being set.  Arguably this is a bug but I can't be
-	# bothered to track it down.  --nenolod
+	# Unset CFLAGS and LDFLAGS because the xen build system
+	# doesn't support them. Instead use .config in xen root
+	# folder if necessary.
 	unset CFLAGS
 	unset LDFLAGS
 
-	# If we provide no parameters it tries to build a kernel image.  We
-	# definitely don't want that.
 	msg "Running preflight check..."
 	(cd tools/check; ./chk build) || return 1
 
 	msg "Building hypervisor..."
-	make -j1 xen || return 1
+	make xen || return 1
 
 	msg "Building tools..."
-	make -j1 tools || return 1
+	make tools || return 1
 
 	msg "Building stub domains..."
 	make -j1 stubdom || return 1
@@ -73,9 +70,6 @@ build() {
 package() {
 	cd "$_builddir"
 
-	# We unset $CFLAGS and $LDFLAGS because Xen's buildsystem does not
-	# like these values being set.  Arguably this is a bug but I can't be
-	# bothered to track it down.  --nenolod
 	unset CFLAGS
 	unset LDFLAGS
 
@@ -87,16 +81,16 @@ package() {
 	install -m755 -D "$srcdir"/xendomains.initd "$pkgdir"/etc/init.d/xendomains
 }
 
-md5sums="fab4bf74d73444ff9b43bced2e4fc5a2  xen-4.1.1.tar.gz
-edb5c3e7fba8214702fac709f0e53124  xen-blktap-uclibc.patch
-1f7f847ae0baa915c7b52d0ed5869fe6  xen-blktap2-uclibc.patch
-a569f16a7e3c832ba3fab6154f657244  xen-disable-firmware.patch
-20ce621f3a2fc8ae78e74b9b72da775c  xen-dont-use-lib64.patch
-0cec6a97de9e4bc178f3e71190495cc3  xen-sed-is-broken-hack.patch
-56af00443c8d40944082e26304452a5e  blktap-write.patch
-c4fc42b11c5917a93f66acf0f83a8747  xen-x86-pic.patch
-faafc199fa8cf33aac44e41c9e1659ea  xen-gcc-4.6-Werror-fix.patch
-202dae12f61f4068971cf9b0f47081da  xen-gcc-4.6-hvmloader-is-broken.patch
-0b62c1fbe2699a32e745724fd301db5b  xencommons.initd
-5ee6a16ec70dfbcd4944ded71b393fa2  xend.initd
-a2b5234483f1b5892d22e9315d9c307f  xendomains.initd"
+md5sums="73561faf3c1b5e36ec5c089b5db848ad  xen-4.1.2.tar.gz
+6d4b045ae56be6288733d0e078f591ea  blktap2_libvhd_add_iconv.patch
+ed3283697cb1ddff066f4087eabf68c6  detect_libiconv.patch
+503f0883f4a0b50fe4e37e09ed9a6177  fix_bswap_blktap.patch
+b973dc1ffcc6872e222b36f3b7b4836b  fix_bswap_blktap2.patch
+10dcf0b6a05691e9f88afc01bd414480  fix_ipxe_no_pie_default.patch
+0bb8a435020a5a49b38b1a447fb69977  define_fsimage_dir.patch
+a7500c42804abdf68e051dc667e65f93  pygrub_alpine.patch
+fa06495a175571f4aa3b6cb88937953e  librt.patch
+1bea3543ddc712330527b62fd9ff6520  busybox-sed.patch
+4cf88b53f8ca8d99ad52bae419b620a7  xencommons.initd
+b5bfc08b82bc0d21193714719a719798  xend.initd
+86e7923383a906404da321d1814657e9  xendomains.initd"