diff options
| author | Eric Andersen <andersen@codepoet.org> | 2005-08-08 06:57:43 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2005-08-08 06:57:43 +0000 |
| commit | 06c5ff4e823cab16987d89c585ef2de4a3db2a7b (patch) | |
| tree | 7c112f6202f48b15e550f602a0e750c7205eb421 | |
| parent | ab3bf08f9c3009364da713bbda03902b9cc06d3b (diff) | |
minor cleanup for target handling
| -rw-r--r-- | target/cramfs/cramfs.mk | 6 | ||||
| -rw-r--r-- | target/ext2/ext2root.mk | 6 | ||||
| -rw-r--r-- | target/jffs2/jffs2root.mk | 6 | ||||
| -rw-r--r-- | target/squashfs/squashfsroot.mk | 6 | ||||
| -rw-r--r-- | target/tar/tarroot.mk | 6 |
5 files changed, 12 insertions, 18 deletions
diff --git a/target/cramfs/cramfs.mk b/target/cramfs/cramfs.mk index 2964dddd3..913a89cf2 100644 --- 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 49b2e076f..5f5bdb1eb 100644 --- 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 32b8ab8bb..03a055880 100644 --- 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 d64380d21..6fd106a5e 100644 --- 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 526f156b6..1d2d6a6ca 100644 --- 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) |