From 1afb8226cbaf011f81158b63c2c169ce05842d21 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Tue, 21 Aug 2007 14:32:38 +0000 Subject: - start to use BR2_HAVE_MANPAGES and BR2_HAVE_INFOPAGES - always error out if ldconfig for the target fails (was inconsistent..) --- target/initramfs/initramfs.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'target/initramfs/initramfs.mk') diff --git a/target/initramfs/initramfs.mk b/target/initramfs/initramfs.mk index dcc0df184..936489c02 100644 --- a/target/initramfs/initramfs.mk +++ b/target/initramfs/initramfs.mk @@ -16,9 +16,13 @@ $(INITRAMFS_TARGET) initramfs: host-fakeroot makedevs rm -f $(TARGET_DIR)/init ln -s sbin/init $(TARGET_DIR)/init -find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true; +ifneq ($(BR2_HAVE_MANPAGES),y) rm -rf $(TARGET_DIR)/usr/man +endif +ifneq ($(BR2_HAVE_INFOPAGES),y) rm -rf $(TARGET_DIR)/usr/info - -/sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null +endif + $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null # Use fakeroot to pretend all target binaries are owned by root rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) touch $(PROJECT_BUILD_DIR)/.fakeroot.00000 -- cgit v1.2.3