From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Fri, 1 Jul 2011 17:47:29 +0000 (-0400)
Subject: kexec tool
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=9eb8577c30bb72ea8f2b75f59936bd866d6bf532;p=xentesttools%2Fbootstrap.git

kexec tool
---

diff --git a/root_image/Makefile b/root_image/Makefile
index e31acaa..20d36f9 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 pm-utils-install cpufrequtils-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 cpufrequtils-install kexec-tools-install
 
 	rm -rf userspace/man
 	rm -rf userspace/usr/share/man
@@ -726,6 +726,11 @@ cpufrequtils-install:
 ifeq ($(RPM_ARCH), x86_64)
 	(cd userspace/usr/$(LIBSDIR); ln -fs  ../lib/libcpufreq.so.0)
 endif
+.PHONY:	kexec-tools-install
+kexec-tools-install:
+	if ! [ -e kexec-tools/include/config.h ]; then (cd kexec-tools; ./bootstrap;./configure --prefix=/usr); fi
+	$(MAKE) $(MFLAGS) -j$$(($(NCPUS) * 2)) -C kexec-tools
+	$(MAKE) $(MFLAGS) -j$$(($(NCPUS) * 2)) -C kexec-tools prefix=$(CURDIR)/userspace install
 
 
 .PHONY: iscsi-install
diff --git a/sources.mk b/sources.mk
index ea3694f..b82bec2 100644
--- a/sources.mk
+++ b/sources.mk
@@ -1,6 +1,6 @@
 
 
-REPOS = syslinux root_image/busybox root_image/netperf root_image/pciutils root_image/fio root_image/RPMs root_image/pm-utils xen linux
+REPOS = syslinux root_image/busybox root_image/netperf root_image/pciutils root_image/fio root_image/RPMs root_image/pm-utils root_image/kexec-tools xen linux
 
 include $(TOP)/scm.mk
 
@@ -38,3 +38,5 @@ $(eval $(call GIT_REPO,xen-unstable.git,xen))
 GIT_URL=git://git.kernel.org/pub/scm/linux/kernel/git/konrad/
 $(eval $(call GIT_REPO,xen.git,linux))
 
+GIT_URL=git://git.kernel.org/pub/scm/utils/kernel/kexec/
+$(eval $(call GIT_REPO,kexec-tools.git,root_image/kexec-tools))