- start to use BR2_HAVE_MANPAGES and BR2_HAVE_INFOPAGES

- always error out if ldconfig for the target fails (was inconsistent..)

diff --git a/target/cloop/cloop.mk b/target/cloop/cloop.mk
index f092f0b13be177f930055abee8a6fc61c59cd94d..e03fe2516ed577718c43819d728a72731bd418d6 100644 (file)
--- a/target/cloop/cloop.mk
+++ b/target/cloop/cloop.mk
@@ -75,9 +75,13 @@ check-tools:
 
 clooproot: cloop check-tools $(IMAGE).cramfs ### cramfsroot
        -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
+ifneq ($(BR2_HAVE_MANPAGES),y)
        @rm -rf $(TARGET_DIR)/usr/man
        @rm -rf $(TARGET_DIR)/usr/share/man
+endif
+ifneq ($(BR2_HAVE_INFOPAGES),y)
        @rm -rf $(TARGET_DIR)/usr/info
+endif
        @rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share
        ### $(CLOOP_DIR)/create_compressed_fs -q -D target/default/device_table.txt $(TARGET_DIR) $(CLOOP_TARGET)
        ## mkisofs -r $(TARGET_DIR) | $(CLOOP_DIR)/create_compressed_fs - 65536 > $(CLOOP_TARGET)

diff --git a/target/cpio/cpioroot.mk b/target/cpio/cpioroot.mk
index b2b4c4951f1a28a4119907510288deadd8925fdc..42c5aecad2c3d8ba61b5486fa0b576d000f6e43f 100644 (file)
--- a/target/cpio/cpioroot.mk
+++ b/target/cpio/cpioroot.mk
@@ -38,9 +38,13 @@ cpioroot-init:
 
 $(CPIO_BASE): host-fakeroot makedevs cpioroot-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
-       -$(TARGET_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

diff --git a/target/cramfs/cramfs.mk b/target/cramfs/cramfs.mk
index 2af85a6a990310740f017d9c7481dde0598b52c6..3acc86a817666fb2a7764ecd4db4b62865ad5fd5 100644 (file)
--- a/target/cramfs/cramfs.mk
+++ b/target/cramfs/cramfs.mk
@@ -50,9 +50,13 @@ CRAMFS_TARGET=$(IMAGE).cramfs
 cramfsroot: host-fakeroot makedevs cramfs
        #-@find $(TARGET_DIR)/lib -type f -name \*.so\* | xargs $(STRIP) --strip-unneeded 2>/dev/null || true;
        -@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
-       -$(TARGET_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 $(CRAMFS_TARGET))
        touch $(PROJECT_BUILD_DIR)/.fakeroot.00000

diff --git a/target/ext2/ext2root.mk b/target/ext2/ext2root.mk
index d49b9c86bdf3c7c737da933c0019de946a7bebf6..94f2456ce93664ddb6f061222b0655c3ee006862 100644 (file)
--- a/target/ext2/ext2root.mk
+++ b/target/ext2/ext2root.mk
@@ -88,13 +88,17 @@ endif
 
 $(EXT2_BASE): host-fakeroot makedevs genext2fs
        -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true
+ifneq ($(BR2_HAVE_MANPAGES),y)
        @rm -rf $(TARGET_DIR)/usr/man
        @rm -rf $(TARGET_DIR)/usr/share/man
+endif
+ifneq ($(BR2_HAVE_INFOPAGES),y)
        @rm -rf $(TARGET_DIR)/usr/info
+endif
        @test -d $(TARGET_DIR)/usr/share && \
                rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share || \
                true
-       -$(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
+       $(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 $(EXT2_TARGET))
        touch $(PROJECT_BUILD_DIR)/.fakeroot.00000

diff --git a/target/initramfs/initramfs.mk b/target/initramfs/initramfs.mk
index dcc0df1846a2b6a81f22c0bf3ced60d331049913..936489c02e6b08b12fc8a9c4de12b682e96d0df1 100644 (file)
--- 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

diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk
index 2d4a325a0c3295da8b47345976b9383d166c4a19..869668bc81c6b1b837445ef284677b19523e71fb 100644 (file)
--- a/target/jffs2/jffs2root.mk
+++ b/target/jffs2/jffs2root.mk
@@ -50,11 +50,15 @@ endif
 #
 $(JFFS2_TARGET): host-fakeroot makedevs mtd-host
        -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
+ifneq ($(BR2_HAVE_MANPAGES),y)
        @rm -rf $(TARGET_DIR)/usr/man
        @rm -rf $(TARGET_DIR)/usr/share/man
+endif
+ifneq ($(BR2_HAVE_INFOPAGES),y)
        @rm -rf $(TARGET_DIR)/usr/info
+endif
        @rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share
-       -$(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
+       $(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 $(JFFS2_TARGET))
        touch $(PROJECT_BUILD_DIR)/.fakeroot.00000

diff --git a/target/squashfs/squashfsroot.mk b/target/squashfs/squashfsroot.mk
index 8e6166e7759ef5ea60e1232431ff89cfdab2174a..3fbdf9a4f7002df9eb1ba48514fd35908e904feb 100644 (file)
--- a/target/squashfs/squashfsroot.mk
+++ b/target/squashfs/squashfsroot.mk
@@ -45,8 +45,12 @@ SQUASHFS_TARGET:=$(IMAGE).squashfs
 
 squashfsroot: host-fakeroot makedevs squashfs
        -@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
+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 $(SQUASHFS_TARGET))

diff --git a/target/tar/tarroot.mk b/target/tar/tarroot.mk
index df40af19198b4902cf229b9b092277e22ffffba7..4ac27575e9a8adbb3c27ecd517b4869100d3414a 100644 (file)
--- a/target/tar/tarroot.mk
+++ b/target/tar/tarroot.mk
@@ -24,8 +24,12 @@ endif
 
 tarroot: host-fakeroot makedevs
        -@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
+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))