[app-emulation/xen-tools] Fixes for live version from Daniel Heemann

(Portage version: 2.2.0_alpha94/git/Linux x86_64, unsigned Manifest commit)

2 files changed, 69 insertions, 3 deletions

diff --git a/app-emulation/xen-tools/files/xen-tools-9999-qemu.patch b/app-emulation/xen-tools/files/xen-tools-9999-qemu.patch
new file mode 100644
index 0000000..2059d6c
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-9999-qemu.patch
@@ -0,0 +1,56 @@
+diff -uNr a/tools/Makefile b/tools/Makefile
+--- a/tools/Makefile	2012-03-10 07:19:16.000000000 +0100
++++ b/tools/Makefile	2012-03-12 17:19:04.000000000 +0100
+@@ -118,11 +118,17 @@
+ 		$(GIT) reset --hard $(QEMU_TAG); \
+ 	fi
+ 
+-subdir-all-qemu-xen-traditional-dir subdir-install-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find
++subdir-all-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find
+ 	set -e; \
+ 		$(buildmakevars2shellvars); \
+ 		cd qemu-xen-traditional-dir; \
+ 		$(QEMU_ROOT)/xen-setup $(IOEMU_CONFIGURE_CROSS); \
++		$(MAKE)
++
++subdir-install-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find
++	set -e; \
++		$(buildmakevars2shellvars); \
++		cd qemu-xen-traditional-dir; \
+ 		$(MAKE) install
+ 
+ subdir-clean-qemu-xen-traditional-dir:
+@@ -140,14 +146,14 @@
+ 		$(GIT) reset --hard $(QEMU_UPSTREAM_REVISION); \
+ 	fi
+ 
+-subdir-all-qemu-xen-dir subdir-install-qemu-xen-dir: qemu-xen-dir-find
++subdir-all-qemu-xen-dir: qemu-xen-dir-find
+ 	if test -d $(QEMU_UPSTREAM_URL) ; then \
+ 		source=$(QEMU_UPSTREAM_URL); \
+ 	else \
+ 		source=.; \
+ 	fi; \
+ 	cd qemu-xen-dir; \
+-	$$source/configure --enable-xen --target-list=i386-softmmu \
++	CFLAGS="" $$source/configure --enable-xen --target-list=i386-softmmu \
+ 		--source-path=$$source \
+ 		--extra-cflags="-I$(XEN_ROOT)/tools/include \
+ 		-I$(XEN_ROOT)/tools/libxc \
+@@ -156,8 +162,16 @@
+ 		-L$(XEN_ROOT)/tools/xenstore" \
+ 		--bindir=$(LIBEXEC) \
+ 		--disable-kvm \
++		--disable-docs \
++		--datadir=$(DESTDIR)/usr/share/xen/qemu-upstream \
++		--sysconfdir=$(DESTDIR)/etc/xen/qemu-upstream \
+ 		--python=$(PYTHON) \
+ 		$(IOEMU_CONFIGURE_CROSS); \
++	sed -i 's#$$(sysconfdir)/qemu#$$(sysconfdir)#' Makefile; \
++	$(MAKE)
++
++subdir-install-qemu-xen-dir: qemu-xen-dir-find
++	cd qemu-xen-dir; \
+ 	$(MAKE) install
+ 
+ subdir-clean-qemu-xen-dir:
diff --git a/app-emulation/xen-tools/xen-tools-9999.ebuild b/app-emulation/xen-tools/xen-tools-9999.ebuild
index 452628a..8c70104 100644
--- a/app-emulation/xen-tools/xen-tools-9999.ebuild
+++ b/app-emulation/xen-tools/xen-tools-9999.ebuild
@@ -93,7 +93,7 @@ RESTRICT="test"
 pkg_setup() {
 	python_set_active_version 2
 	python_pkg_setup
-	export "CONFIG_LOMOUNT=y"
+	export "CONFIG_TESTS=n"
 
 	if use qemu; then
 		export "CONFIG_IOEMU=y"
@@ -182,6 +182,16 @@ src_prepare() {
 		-e 's:^\tfi:#\tfi:' -i \
 		-e 's:^\tmv _$T $T:#\tmv _$T $T:' \
 		-i tools/firmware/etherboot/Makefile || die
+
+	# Patch tools/Makefile to build/install qemu & qemu-upstream correctly
+	epatch "${FILESDIR}/${PN}-9999-qemu.patch"
+}
+
+src_configure() {
+	econf \
+		--enable-lomount \
+		BISON=/usr/bin/bison \
+		FLEX=/usr/bin/flex
 }
 
 src_compile() {
@@ -241,8 +251,8 @@ src_install() {
 	newconfd "${FILESDIR}"/xenstored.confd xenstored
 	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
 	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-	newinitd "${FILESDIR}"/xenstored.initd xenstored \
-		"${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xenstored.initd xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
 
 	if use screen; then
 		cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendomains || die