minor cleanup for target handling

diff --git a/target/cramfs/cramfs.mk b/target/cramfs/cramfs.mk
index 2964dddd3702df2b2d73b4e232680ef87445e6ad..913a89cf27144fc6b363f5141ddcb8e38f952632 100644 (file)
--- a/target/cramfs/cramfs.mk
+++ b/target/cramfs/cramfs.mk
@@ -58,14 +58,14 @@ ifeq ($(strip $(BR2_sparc)),y)
 CRAMFS_ENDIANNESS=-b
 endif
 
-cramfsroot: 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;
        @rm -rf $(TARGET_DIR)/usr/man
        @rm -rf $(TARGET_DIR)/usr/info
-       /sbin/ldconfig -r $(TARGET_DIR)
+       -/sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null
        # Use fakeroot to pretend all target binaries are owned by root
-       $(STAGING_DIR)/usr/bin/fakeroot \
+       -$(STAGING_DIR)/usr/bin/fakeroot \
                -i $(STAGING_DIR)/fakeroot.env \
                -s $(STAGING_DIR)/fakeroot.env -- \
                chown -R root:root $(TARGET_DIR)

diff --git a/target/ext2/ext2root.mk b/target/ext2/ext2root.mk
index 49b2e076f56ab6455f161461c4f99591a832d36c..5f5bdb1eb87328189ee7a4ee606a6285bfa209e6 100644 (file)
--- a/target/ext2/ext2root.mk
+++ b/target/ext2/ext2root.mk
@@ -70,11 +70,9 @@ $(EXT2_BASE): host-fakeroot makedevs genext2fs
        @rm -rf $(TARGET_DIR)/usr/man
        @rm -rf $(TARGET_DIR)/usr/share/man
        @rm -rf $(TARGET_DIR)/usr/info
-       test -e "$(TARGET_DIR)/etc/ld.so.conf" \
-               && /sbin/ldconfig -r $(TARGET_DIR) \
-               || true
+       -/sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null
        # Use fakeroot to pretend all target binaries are owned by root
-       $(STAGING_DIR)/usr/bin/fakeroot \
+       -$(STAGING_DIR)/usr/bin/fakeroot \
                -i $(STAGING_DIR)/fakeroot.env \
                -s $(STAGING_DIR)/fakeroot.env -- \
                chown -R root:root $(TARGET_DIR)

diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk
index 32b8ab8bbd2ca4c42d10283a846fa936466cbb79..03a0558808cd8efc57d8601a2834484413c65d74 100644 (file)
--- a/target/jffs2/jffs2root.mk
+++ b/target/jffs2/jffs2root.mk
@@ -43,11 +43,9 @@ $(JFFS2_TARGET): host-fakeroot makedevs mtd-host
        @rm -rf $(TARGET_DIR)/usr/man
        @rm -rf $(TARGET_DIR)/usr/share/man
        @rm -rf $(TARGET_DIR)/usr/info
-       test -e "$(TARGET_DIR)/etc/ld.so.conf" \
-               && /sbin/ldconfig -r $(TARGET_DIR) \
-               || true
+       -/sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null
        # Use fakeroot to pretend all target binaries are owned by root
-       $(STAGING_DIR)/usr/bin/fakeroot \
+       -$(STAGING_DIR)/usr/bin/fakeroot \
                -i $(STAGING_DIR)/fakeroot.env \
                -s $(STAGING_DIR)/fakeroot.env -- \
                chown -R root:root $(TARGET_DIR)

diff --git a/target/squashfs/squashfsroot.mk b/target/squashfs/squashfsroot.mk
index d64380d215b2382d7248f8a106dd178a566fd080..6fd106a5e9698a91c84f7c861f31b0b3c2b5accb 100644 (file)
--- a/target/squashfs/squashfsroot.mk
+++ b/target/squashfs/squashfsroot.mk
@@ -53,13 +53,13 @@ ifeq ($(strip $(BR2_sparc)),y)
 SQUASHFS_ENDIANNESS=-be
 endif
 
-squashfsroot: squashfs host-fakeroot makedevs
+squashfsroot: host-fakeroot makedevs squashfs
        -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
        @rm -rf $(TARGET_DIR)/usr/man
        @rm -rf $(TARGET_DIR)/usr/info
-       /sbin/ldconfig -r $(TARGET_DIR)
+       -/sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null
        # Use fakeroot to pretend all target binaries are owned by root
-       $(STAGING_DIR)/usr/bin/fakeroot \
+       -$(STAGING_DIR)/usr/bin/fakeroot \
                -i $(STAGING_DIR)/fakeroot.env \
                -s $(STAGING_DIR)/fakeroot.env -- \
                chown -R root:root $(TARGET_DIR)

diff --git a/target/tar/tarroot.mk b/target/tar/tarroot.mk
index 526f156b6a4fc52fccb215c54c81fce2c841af1c..1d2d6a6cafdf6ff5af8513242ca75c4c0035eaed 100644 (file)
--- a/target/tar/tarroot.mk
+++ b/target/tar/tarroot.mk
@@ -10,11 +10,9 @@ tarroot: host-fakeroot makedevs
        -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
        @rm -rf $(TARGET_DIR)/usr/man
        @rm -rf $(TARGET_DIR)/usr/info
-       test -e "$(TARGET_DIR)/etc/ld.so.conf" \
-               && /sbin/ldconfig -r $(TARGET_DIR) \
-               || true
+       -/sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null
        # Use fakeroot to pretend all target binaries are owned by root
-       $(STAGING_DIR)/usr/bin/fakeroot \
+       -$(STAGING_DIR)/usr/bin/fakeroot \
                -i $(STAGING_DIR)/fakeroot.env \
                -s $(STAGING_DIR)/fakeroot.env -- \
                chown -R root:root $(TARGET_DIR)