From: Jean Guyader <jean.guyader@eu.citrix.com>
Date: Tue, 26 Jan 2010 16:57:04 +0000 (+0000)
Subject: [package/xen] Build qemu as well.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1c8a2838a9e192b5691ba2b162272c6ea72a8b26;p=xenclient%2Fbuild.git

[package/xen] Build qemu as well.
---

diff --git a/package/xenclient/ioemu/ioemu.mk b/package/xenclient/ioemu/ioemu.mk
index fb9d96e..60456d4 100644
--- a/package/xenclient/ioemu/ioemu.mk
+++ b/package/xenclient/ioemu/ioemu.mk
@@ -24,13 +24,17 @@ $(XENCLIENT_IOEMU_DIR): $(XENCLIENT_IOEMU_REPO) $(XENCLIENT_MK_BUILD_DIR_ALWAYS)
 xenclient-ioemu-install:
 	mkdir -p $(TARGET_DIR)/usr/lib/xen/bin
 	cp $(XENCLIENT_IOEMU_DIR)/i386-dm/qemu-dm $(TARGET_DIR)/usr/lib/xen/bin/qemu-dm
+	cp $(XENCLIENT_IOEMU_DIR)/i386-dm/qemu-ifup $(TARGET_DIR)/etc/xen
 
 xenclient-ioemu-source: $(XENCLIENT_IOEMU_DIR)
 
 xenclient-ioemu: $(XENCLIENT_IOEMU_DIR)
 	# Normally built by xen tools but this allows a rebuild w/o xen
+	$(TARGET_CONFIGURE_ENV) CC=${TARGET_CC} XEN_TARGET_ARCH=x86_32 \
+	cd $(XENCLIENT_IOEMU_DIR) && ./xen-setup --cross-prefix=${TARGET_CC:gcc=} --cc=${TARGET_CC}
+	cd $(XENCLIENT_IOEMU_DIR) && sed -i'' -re 's/.*XEN_ROOT.*//' config-host.mak
 	$(TARGET_CONFIGURE_ENV) \
-	XEN_TARGET_ARCH=x86_32 STAGING_ROOT=$(STAGING_DIR) CROSS_COMPILE=${TARGET_CC:gcc=} CC=${TARGET_CC} $(MAKE) -C $(XENCLIENT_XEN_DIR)/tools subdir-all-ioemu-dir
+	XEN_TARGET_ARCH=x86_32 STAGING_ROOT=$(STAGING_DIR) CROSS_COMPILE=${TARGET_CC:gcc=} CC=${TARGET_CC} $(MAKE) -C $(XENCLIENT_IOEMU_DIR)
 	$(MAKE1) xenclient-ioemu-install
 
 xenclient-ioemu-clean:
@@ -41,9 +45,3 @@ xenclient-ioemu-dirclean:
 	rm -rf $(XENCLIENT_IOEMU_DIR)
 
 xenclient-source: xenclient-ioemu-source
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
diff --git a/package/xenclient/xen/xen.mk b/package/xenclient/xen/xen.mk
index 203ae76..b932479 100644
--- a/package/xenclient/xen/xen.mk
+++ b/package/xenclient/xen/xen.mk
@@ -130,7 +130,7 @@ xenclient-xen-dirclean:
 #
 #############################################################
 ifeq ($(BR2_PACKAGE_XENCLIENT_XEN),y)
-TARGETS+=xenclient-xen-auto
+TARGETS+=xenclient-xen-auto xenclient-ioemu
 endif
 
 xenclient-source: xenclient-xen-source