]> xenbits.xensource.com Git - xentesttools/bootstrap.git/commitdiff
Revert "ntpdate: Add ntpdate extraction."
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 20 Jun 2012 17:50:23 +0000 (13:50 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 20 Jun 2012 17:50:29 +0000 (13:50 -0400)
This reverts commit 4c7f9ad57e33067cbdd7975beb324b6f1a283a2c.

Conflicts:

root_image/Makefile

[we don't want ntpdate in the little image]
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
root_image/Makefile

index 5ab51deac17b9788a3d618f2345342908e44de79..8571a90e630246485d4dc28577fb75d632e3f5d3 100644 (file)
@@ -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