From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Tue, 17 May 2011 18:44:16 +0000 (-0400)
Subject: Add pm-utils-install directive.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c7c70e04def39e5e746688db4ac8cdbb0c57a8a5;p=xentesttools%2Fbootstrap.git

Add pm-utils-install directive.
---

diff --git a/root_image/Makefile b/root_image/Makefile
index b60be5c..2bfa446 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 irqbalance-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 pm-utils-install
 
 	rm -rf userspace/man
 	rm -rf userspace/usr/share/man
@@ -467,6 +467,7 @@ endif
 	$(call RPM_TO_USERSPACE,./sbin/swapon,$(RPM_DIR)/util-linux-ng)
 	$(call RPM_TO_USERSPACE,./sbin/swapoff,$(RPM_DIR)/util-linux-ng)
 	$(call RPM_TO_USERSPACE,./usr/bin/hexdump,$(RPM_DIR)/util-linux-ng)
+	$(call RPM_TO_USERSPACE,./usr/bin/flock,$(RPM_DIR)/util-linux-ng)
 	$(call RPM_TO_USERSPACE,./usr/bin/time,$(RPM_DIR)/time)
 	$(call RPM_TO_USERSPACE,./usr/bin/which,$(RPM_DIR)/which)
 	$(call RPM_TO_USERSPACE_ALWAYS,./bin/egrep,$(RPM_DIR)/grep)
@@ -709,6 +710,12 @@ irqbalance-install:
 
 	$(INSTALL_PROG)   irqbalance/irqbalance     userspace/usr/sbin/
 
+.PHONY:	pm-utils-install
+pm-utils-install:
+	if ! [ -e pm-utils/config.h ]; then (cd pm-utils; ./autogen.sh;./configure --prefix=/usr); fi
+	$(MAKE) $(MFLAGS) -j$$(($(NCPUS) * 2)) -C pm-utils
+	$(MAKE) $(MFLAGS) -j$$(($(NCPUS) * 2)) -C pm-utils DESTDIR=$(CURDIR)/userspace install
+
 .PHONY: iscsi-install
 iscsi-install:
 	$(call RPM_TO_USERSPACE,./sbin/iscsiadm,$(RPM_DIR)/iscsi-initiator-utils)