From db9a1f0d445d1142c21254cb14f0bbd9d9fbcdf7 Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Tue, 19 Jun 2012 06:43:05 -0400 Subject: [PATCH] Makefile: Fix the build issues with perf messing up the built modules. Signed-off-by: Konrad Rzeszutek Wilk Conflicts: root_image/Makefile --- root_image/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/root_image/Makefile b/root_image/Makefile index 30a41be..4b56bc3 100644 --- a/root_image/Makefile +++ b/root_image/Makefile @@ -187,9 +187,8 @@ 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 netperf-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 +.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 oprofile-install perf-install power-install oprofile-install root_image-userspace-install: $(USERSPACE_INSTALL) add-libs add-bins tools-install netperf-install rm -rf userspace/man @@ -823,11 +822,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 -- 2.39.5