From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Wed, 20 Jun 2012 19:09:08 +0000 (-0400)
Subject: Makefile: Include perf
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=refs%2Fheads%2Fpvhvm-testing;p=xentesttools%2Fbootstrap.git

Makefile: Include perf

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

diff --git a/root_image/Makefile b/root_image/Makefile
index 2e923b4..7d1a671 100644
--- a/root_image/Makefile
+++ b/root_image/Makefile
@@ -190,7 +190,8 @@ distdir:
 .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  tools-install netperf-install
+#root_image-userspace-install: $(USERSPACE_INSTALL) add-libs add-bins  tools-install netperf-install
+root_image-userspace-install: $(USERSPACE_INSTALL) add-libs add-bins add-debug-bins tools-install wget-install vim-install  openssh-install  netperf-install  bridge-utils-install  perf-install
 	rm -rf userspace/man
 	rm -rf userspace/usr/share/man
 	rm -rf userspace/usr/share/doc
@@ -240,12 +241,12 @@ endif
 	$(call RPM_TO_USERSPACE,*libnss_compat.so*,$(RPM_DIR)/glibc)
 	$(call RPM_TO_USERSPACE,*libnss_compat-$(GLIBC_VERSION).so*,$(RPM_DIR)/glibc)
 
-#	$(call RPM_TO_USERSPACE,*libcrypt-$(GLIBC_VERSION).so*,$(RPM_DIR)/glibc)
-#	$(call RPM_TO_USERSPACE,*libcrypt.so*,$(RPM_DIR)/glibc)
+	$(call RPM_TO_USERSPACE,*libcrypt-$(GLIBC_VERSION).so*,$(RPM_DIR)/glibc)
+	$(call RPM_TO_USERSPACE,*libcrypt.so*,$(RPM_DIR)/glibc)
 
 	$(call RPM_TO_USERSPACE_ALWAYS,*$(LIBSDIR)/libgcc_s.so*,$(RPM_DIR)/libgcc)
 	$(call RPM_TO_USERSPACE_ALWAYS,*$(LIBSDIR)/libgcc_s-*.so*,$(RPM_DIR)/libgcc)
-#	$(call RPM_TO_USERSPACE,*libcrypto.so*,$(RPM_DIR)/openssl)
+	$(call RPM_TO_USERSPACE,*libcrypto.so*,$(RPM_DIR)/openssl)
 
 ifdef FC12_RPM
 	$(call RPM_TO_USERSPACE,*libuuid.so*,$(RPM_DIR)/libuuid)
@@ -810,7 +811,7 @@ xen-4.2-depend:
 power-depend:
 
 .PHONY: perf-depend
-perf-depend:
+perf-depend: python-deps
 	$(call RPM_TO_USERSPACE,*libelf*.so*,$(RPM_DIR)/elfutils-libelf)
 	$(call RPM_TO_USERSPACE,*libdw*.so*,$(RPM_DIR)/elfutils-libs)
 	$(call RPM_TO_USERSPACE,*libnewt*.so*,$(RPM_DIR)/newt)