From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Fri, 13 May 2011 17:46:04 +0000 (-0400)
Subject: irqbalance: Use the out-of-tree version.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=fb80a310c732bd2ffd53845d2b63095d2ce21a26;p=xentesttools%2Fbootstrap.git

irqbalance: Use the out-of-tree version.
---

diff --git a/root_image/Makefile b/root_image/Makefile
index 93d4f53..b60be5c 100644
--- a/root_image/Makefile
+++ b/root_image/Makefile
@@ -188,7 +188,7 @@ distdir:
 # This target includes all userspace tools and images
 # It does not include the Linux drivers/modules found in the modulespace target
 .PHONY:	root_image-userspace-install
-root_image-userspace-install: $(USERSPACE_INSTALL) add-libs add-bins add-debug-bins tools-install wget-install vim-install rsync-install openssh-install xtt-tools-install netperf-install lvm2-install plymouth-install pciutils-install iscsi-install bridge-utils-install xend-install nfs-install fio-install directfb-install
+root_image-userspace-install: $(USERSPACE_INSTALL) add-libs add-bins add-debug-bins tools-install wget-install vim-install rsync-install openssh-install xtt-tools-install netperf-install lvm2-install plymouth-install pciutils-install iscsi-install bridge-utils-install xend-install nfs-install fio-install directfb-install irqbalance-install
 
 	rm -rf userspace/man
 	rm -rf userspace/usr/share/man
@@ -529,7 +529,6 @@ endif
 ifdef FC12_RPM
 	$(call RPM_TO_USERSPACE,*libcap-ng.so*,$(RPM_DIR)/libcap-ng)
 endif
-	$(call RPM_TO_USERSPACE,./usr/sbin/irqbalance,$(RPM_DIR)/irqbalance)
 	$(call RPM_TO_USERSPACE,./sbin/mingetty,$(RPM_DIR)/mingetty)
 
 
@@ -703,6 +702,13 @@ ifeq ($(RPM_ARCH), x86_64)
 endif
 	(cd userspace$(LIBSDIR); ln -fs ../usr$(LIBSDIR)/libsysfs.so.2)
 
+.PHONY:	irqbalance-install
+irqbalance-install:
+	if ! [ -e irqbalance/config.h ]; then (cd irqbalance; ./autogen.sh;./configure --prefix=/usr); fi
+	$(MAKE) $(MFLAGS) -j$$(($(NCPUS) * 2)) -C irqbalance
+
+	$(INSTALL_PROG)   irqbalance/irqbalance     userspace/usr/sbin/
+
 .PHONY: iscsi-install
 iscsi-install:
 	$(call RPM_TO_USERSPACE,./sbin/iscsiadm,$(RPM_DIR)/iscsi-initiator-utils)