From: Konrad Rzeszutek Wilk Date: Tue, 19 Jun 2012 10:43:05 +0000 (-0400) Subject: Makefile: Fix the build issues with perf messing up the built modules. X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a7459b7820629810b7111be9b48de0a1173df27c;p=xentesttools%2Fbootstrap.git Makefile: Fix the build issues with perf messing up the built modules. Signed-off-by: Konrad Rzeszutek Wilk --- diff --git a/root_image/Makefile b/root_image/Makefile index fb3fc05..13b6fd9 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 kexec-tools-install perf-install oprofile-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 oprofile-install perf-install power-install rm -rf userspace/man rm -rf userspace/usr/share/man @@ -820,11 +820,13 @@ perf-depend: .PHONY: perf-install perf-install: perf-depend - $(MAKE) -j$$(($(NCPUS) * 2)) $(MFLAGS) V=1 NO_GTK2=1 DESTDIR=$(shell pwd)/userspace/ -C $(LINUX_SRC)/tools O=$(LINUX_DST) perf_install + mkdir -p $(LINUX_DST)/tools + $(MAKE) -j$$(($(NCPUS) * 2)) $(MFLAGS) V=1 NO_GTK2=1 DESTDIR=$(shell pwd)/userspace/ -C $(LINUX_SRC)/tools O=$(LINUX_DST)/tools perf_install .PHONY: power-install power-install: power-depend - $(MAKE) $(MFLAGS) V=1 DESTDIR=$(shell pwd)/userspace/ -C $(LINUX_SRC)/tools O=$(LINUX_DST) cpupower_install + mkdir -p $(LINUX_DST)/tools + $(MAKE) $(MFLAGS) V=1 DESTDIR=$(shell pwd)/userspace/ -C $(LINUX_SRC)/tools O=$(LINUX_DST)/tools cpupower_install ifeq ($(RPM_ARCH), x86_64) (cd userspace/usr$(LIBSDIR); ln -fs ../lib/libcpupower.so.0) endif