diff options
| -rw-r--r-- | target/cpio/cpioroot.mk | 2 | ||||
| -rw-r--r-- | target/cramfs/cramfs.mk | 2 | ||||
| -rw-r--r-- | target/ext2/ext2root.mk | 2 | ||||
| -rw-r--r-- | target/initramfs/initramfs.mk | 2 | ||||
| -rw-r--r-- | target/jffs2/jffs2root.mk | 2 | ||||
| -rw-r--r-- | target/squashfs/squashfsroot.mk | 2 | ||||
| -rw-r--r-- | target/tar/tarroot.mk | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/target/cpio/cpioroot.mk b/target/cpio/cpioroot.mk index 24181d6b0..b1d117c08 100644 --- a/target/cpio/cpioroot.mk +++ b/target/cpio/cpioroot.mk @@ -44,7 +44,7 @@ endif ifneq ($(BR2_HAVE_INFOPAGES),y) @rm -rf $(TARGET_DIR)/usr/info endif - $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null + $(if $(TARGET_LDCONFIG),test -x $(TARGET_LDCONFIG) && $(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 57170f731..9a5e22cf1 100644 --- a/target/cramfs/cramfs.mk +++ b/target/cramfs/cramfs.mk @@ -56,7 +56,7 @@ endif ifneq ($(BR2_HAVE_INFOPAGES),y) @rm -rf $(TARGET_DIR)/usr/info endif - $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null + $(if $(TARGET_LDCONFIG),test -x $(TARGET_LDCONFIG) && $(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 fd0016df8..779ffd9bb 100644 --- a/target/ext2/ext2root.mk +++ b/target/ext2/ext2root.mk @@ -98,7 +98,7 @@ 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 + $(if $(TARGET_LDCONFIG),test -x $(TARGET_LDCONFIG) && $(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 5476b23cb..28703d672 100644 --- a/target/initramfs/initramfs.mk +++ b/target/initramfs/initramfs.mk @@ -22,7 +22,7 @@ endif ifneq ($(BR2_HAVE_INFOPAGES),y) rm -rf $(TARGET_DIR)/usr/info endif - $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null + $(if $(TARGET_LDCONFIG),test -x $(TARGET_LDCONFIG) && $(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 bf54a5e4a..de93213b9 100644 --- a/target/jffs2/jffs2root.mk +++ b/target/jffs2/jffs2root.mk @@ -58,7 +58,7 @@ 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 + $(if $(TARGET_LDCONFIG),test -x $(TARGET_LDCONFIG) && $(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 bb23c0e69..a324460b2 100644 --- a/target/squashfs/squashfsroot.mk +++ b/target/squashfs/squashfsroot.mk @@ -51,7 +51,7 @@ endif ifneq ($(BR2_HAVE_INFOPAGES),y) @rm -rf $(TARGET_DIR)/usr/info endif - $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null + $(if $(TARGET_LDCONFIG),test -x $(TARGET_LDCONFIG) && $(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)) touch $(PROJECT_BUILD_DIR)/.fakeroot.00000 diff --git a/target/tar/tarroot.mk b/target/tar/tarroot.mk index 7adb1455f..d471548fb 100644 --- a/target/tar/tarroot.mk +++ b/target/tar/tarroot.mk @@ -30,7 +30,7 @@ endif ifneq ($(BR2_HAVE_INFOPAGES),y) @rm -rf $(TARGET_DIR)/usr/info endif - $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null + $(if $(TARGET_LDCONFIG),test -x $(TARGET_LDCONFIG) && $(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 |