From: Konrad Rzeszutek Wilk Date: Wed, 20 Jun 2012 17:50:23 +0000 (-0400) Subject: Revert "ntpdate: Add ntpdate extraction." X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=489e5eadfe9d25dfcbec5ecbe5c22782c024b740;p=xentesttools%2Fbootstrap.git Revert "ntpdate: Add ntpdate extraction." This reverts commit 4c7f9ad57e33067cbdd7975beb324b6f1a283a2c. Conflicts: root_image/Makefile [we don't want ntpdate in the little image] Signed-off-by: Konrad Rzeszutek Wilk --- diff --git a/root_image/Makefile b/root_image/Makefile index 5ab51de..8571a90 100644 --- a/root_image/Makefile +++ b/root_image/Makefile @@ -353,8 +353,6 @@ add-bins: userspace-prep ifeq ($(RPM_ARCH), x86_64) $(call RPM_TO_USERSPACE,./usr/sbin/mcelog,$(RPM_DIR)/mcelog) endif - $(call RPM_TO_USERSPACE,./usr/sbin/ntpdate,$(RPM_DIR)/ntpdate) - .PHONY: add-debug-bins add-debug-bins: root_image-tools-install @@ -930,12 +928,6 @@ xtt-tools-install: directfb-install $(INSTALL_PROG) tools/eatmem/eatmem userspace/usr/bin/ $(INSTALL_PROG) tools/drfb_test/dfbtest_fillrect userspace/usr/bin/ $(INSTALL_PROG) tools/drfb_load/drfb_load userspace/usr/bin/ - $(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) -else - $(call RPM_TO_USERSPACE,./usr/lib/libopcodes*,$(RPM_DIR)/binutils) -endif fio/fio: fio/fio $(MAKE) -j$$(($(NCPUS) * 2)) -C fio