xen: update to 4.2.0-rc4

Next version (4.2) is scheduled to be released very soon
if everything goes ok. This is a very close rc,
which we can start testing until 4.2 comes out.

1 files changed, 43 insertions, 28 deletions

diff --git a/main/xen/APKBUILD b/main/xen/APKBUILD
index 007f3006a0..fdc01f05fc 100644
--- a/main/xen/APKBUILD
+++ b/main/xen/APKBUILD
@@ -2,26 +2,24 @@
 # Contributor: Roger Pau Monne <roger.pau@entel.upc.edu>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=xen
-pkgver=4.1.3
+pkgver=4.2.0
+pkgrc=4
 pkgrel=0
 pkgdesc="Xen hypervisor"
 url="http://www.xen.org/"
 arch="x86 x86_64"
 license="GPL"
-depends="udev syslinux bash"
+depends="syslinux bash"
 depends_dev="openssl-dev python-dev e2fsprogs-dev gettext zlib-dev ncurses-dev
-	libiconv-dev dev86 texinfo perl iasl pciutils-dev"
+	libiconv-dev dev86 texinfo perl iasl pciutils-dev glib-dev yajl-dev"
 makedepends="$depends_dev"
 install=""
-subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-hypervisor"
-source="http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.gz
-	blktap2_libvhd_add_iconv.patch
-	detect_libiconv.patch
-	fix_bswap_blktap.patch
-	fix_bswap_blktap2.patch
-	define_fsimage_dir.patch
+subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-hypervisor $pkgname-xend"
+source="http://xenbits.xen.org/people/royger/$pkgname-$pkgver-rc$pkgrc.tar.gz
+	qemu_uclibc_configure.patch
 	librt.patch
-	busybox-sed.patch
+	make_stubdoms.patch
+	qemu-xen_paths.patch
 
 	xenstored.initd
 	xenstored.confd
@@ -32,12 +30,15 @@ source="http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.g
 	xendomains.initd
 	xendomains.confd
 	xen-consoles.logrotate
+	xenqemu.confd
+	xenqemu.initd
 	"
 
-_builddir="$srcdir"/$pkgname-$pkgver
+_builddir="$srcdir"/$pkgname
 prepare() {
 	local i
 	cd "$_builddir"
+
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
@@ -48,7 +49,11 @@ prepare() {
 	msg "Eradicating -Werror..."
 	find -name '*.mk' -o -name 'Make*' | xargs sed -i -e 's/-Werror//g'
 
-	echo "LIBLEAFDIR_x86_64=lib" >> .config
+	unset CFLAGS
+	unset LDFLAGS	
+
+	msg "Running configure..."
+	./configure || return 1
 }
 
 build() {
@@ -60,17 +65,17 @@ build() {
 	unset CFLAGS
 	unset LDFLAGS
 
-	msg "Running preflight check..."
-	(cd tools/check; ./chk build) || return 1
-
 	msg "Building hypervisor..."
 	make xen || return 1
 
 	msg "Building tools..."
 	make tools || return 1
 
+	msg "Building documentation..."
+	make docs || return 1
+
 	msg "Building stub domains..."
-	make -j1 stubdom || return 1
+	make stubdom || return 1
 }
 
 package() {
@@ -79,8 +84,8 @@ package() {
 	unset CFLAGS
 	unset LDFLAGS
 
-	make -j1 DESTDIR="$pkgdir" install-xen install-tools install-stubdom \
-		|| return 1
+	make -j1 DESTDIR="$pkgdir" install-xen install-tools install-docs \
+		install-stubdom || return 1
 
 	# remove default xencommons
 	rm -rf "$pkgdir"/etc/init.d/xencommons
@@ -113,14 +118,22 @@ hypervisor() {
 	mv "$pkgdir"/boot "$subpkgdir"/
 }
 
-md5sums="bed929d5c5e5135cab40e2a6aab73fa0  xen-4.1.3.tar.gz
-6d4b045ae56be6288733d0e078f591ea  blktap2_libvhd_add_iconv.patch
-ed3283697cb1ddff066f4087eabf68c6  detect_libiconv.patch
-503f0883f4a0b50fe4e37e09ed9a6177  fix_bswap_blktap.patch
-b973dc1ffcc6872e222b36f3b7b4836b  fix_bswap_blktap2.patch
-0bb8a435020a5a49b38b1a447fb69977  define_fsimage_dir.patch
-fa06495a175571f4aa3b6cb88937953e  librt.patch
-1bea3543ddc712330527b62fd9ff6520  busybox-sed.patch
+xend() {
+	pkgdesc="Xend toolstack"
+	replaces="xen"
+	depends="udev xen python"
+	mkdir -p "$subpkgdir"
+	sitepackages=`python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"`
+	mkdir -p "$subpkgdir"/"$sitepackages"/xen
+	find "$pkgdir"/"$sitepackages"/xen -maxdepth 1 -mindepth 1 -type d -not -name lowlevel \
+		-exec mv '{}' "$subpkgdir"/"$sitepackages"/xen \;
+}
+
+md5sums="336a2a6cde9cbbe861decf442bf5cd5e  xen-4.2.0-rc4.tar.gz
+1b165c3b1288e2952cf852d36dfaaa67  qemu_uclibc_configure.patch
+35039c88b4f573f672b3178d9d65c5b7  librt.patch
+41ad48fdc269749776fa6aa04f6778c2  make_stubdoms.patch
+1ccde6b36a6f9542a16d998204dc9a22  qemu-xen_paths.patch
 6e5739dad7e2bd1b625e55ddc6c782b7  xenstored.initd
 b017ccdd5e1c27bbf1513e3569d4ff07  xenstored.confd
 ed262f15fb880badb53575539468646c  xenconsoled.initd
@@ -129,4 +142,6 @@ ec2252c72050d7d5870a3a629b873ba6  xenconsoled.confd
 9261ad0f285836c1b0ea07f306e4586e  xend.confd
 35448ff063f8123ec4bba2e001f39c6c  xendomains.initd
 9b20e056d475b50586cf9e1fc94e13c4  xendomains.confd
-9df68ac65dc3f372f5d61183abdc83ff  xen-consoles.logrotate"
+9df68ac65dc3f372f5d61183abdc83ff  xen-consoles.logrotate
+6a2f777c16678d84039acf670d86fff6  xenqemu.confd
+fbd2082d448acfec2e69b860120d79b7  xenqemu.initd"