Makefile: perf-install

does not like to be build in parallel. Disable that (And also don't be
so verbose). We also need to fix up the depends.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

diff --git a/root_image/Makefile b/root_image/Makefile
index 9b2dacb5df888885a2ac61be8309c8fc74cb4bf4..385e5123746396cdfa52f9699ab7b4334ec57a29 100644 (file)
--- a/root_image/Makefile
+++ b/root_image/Makefile
@@ -838,11 +838,15 @@ perf-depend:
        $(call RPM_TO_USERSPACE,./usr/bin/expand,$(RPM_DIR)/coreutils)
        $(call RPM_TO_USERSPACE,./usr/bin/objdump,$(RPM_DIR)/binutils)
        $(call RPM_TO_USERSPACE,*libunwind*.so*,$(RPM_DIR)/libunwind)
+ifeq ($(RPM_ARCH), x86_64)
+       ln -sf /lib64/libc.so.6 userspace/lib
+       ln -sf /lib64/ld-linux-x86-64.so.2 userspace/lib/ld-linux.so.2
+endif
 
 .PHONY: perf-install
 perf-install: perf-depend
        mkdir -p $(LINUX_DST)/tools/perf
-       NO_LIBNUMA=1 $(MAKE) -j$$(($(NCPUS) * 2)) $(MFLAGS) V=1 NO_GTK2=1 DESTDIR=$(shell pwd)/userspace/ -C $(LINUX_SRC)/tools/perf O=$(LINUX_DST)/tools/perf install
+       NO_LIBNUMA=1 $(MAKE)  $(MFLAGS) NO_GTK2=1 DESTDIR=$(shell pwd)/userspace/ -C $(LINUX_SRC)/tools/perf O=$(LINUX_DST)/tools/perf install
        $(call RPM_TO_USERSPACE,./usr/bin/objdump,$(RPM_DIR)/binutils)
 ifeq ($(RPM_ARCH), x86_64)
        $(call RPM_TO_USERSPACE,./usr/lib64/libopcodes*,$(RPM_DIR)/binutils)