[uClibc-cvs] svn commit: trunk/buildroot/target: cramfs ext2 jffs2 squashfs tar

[andersen at uclibc.org]

Author: andersen
Date: 2005-08-08 00:57:43 -0600 (Mon, 08 Aug 2005)
New Revision: 11056

Log:
minor cleanup for target handling


Modified:
   trunk/buildroot/target/cramfs/cramfs.mk
   trunk/buildroot/target/ext2/ext2root.mk
   trunk/buildroot/target/jffs2/jffs2root.mk
   trunk/buildroot/target/squashfs/squashfsroot.mk
   trunk/buildroot/target/tar/tarroot.mk


Changeset:
Modified: trunk/buildroot/target/cramfs/cramfs.mk
===================================================================
--- trunk/buildroot/target/cramfs/cramfs.mk	2005-08-08 00:42:49 UTC (rev 11055)
+++ trunk/buildroot/target/cramfs/cramfs.mk	2005-08-08 06:57:43 UTC (rev 11056)
@@ -58,14 +58,14 @@
 CRAMFS_ENDIANNESS=-b
 endif
 
-cramfsroot: cramfs
+cramfsroot: host-fakeroot makedevs cramfs
 	#- at find $(TARGET_DIR)/lib -type f -name \*.so\* | xargs $(STRIP) --strip-unneeded 2>/dev/null || true;
 	- at 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)

Modified: trunk/buildroot/target/ext2/ext2root.mk
===================================================================
--- trunk/buildroot/target/ext2/ext2root.mk	2005-08-08 00:42:49 UTC (rev 11055)
+++ trunk/buildroot/target/ext2/ext2root.mk	2005-08-08 06:57:43 UTC (rev 11056)
@@ -70,11 +70,9 @@
 	@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)

Modified: trunk/buildroot/target/jffs2/jffs2root.mk
===================================================================
--- trunk/buildroot/target/jffs2/jffs2root.mk	2005-08-08 00:42:49 UTC (rev 11055)
+++ trunk/buildroot/target/jffs2/jffs2root.mk	2005-08-08 06:57:43 UTC (rev 11056)
@@ -43,11 +43,9 @@
 	@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)

Modified: trunk/buildroot/target/squashfs/squashfsroot.mk
===================================================================
--- trunk/buildroot/target/squashfs/squashfsroot.mk	2005-08-08 00:42:49 UTC (rev 11055)
+++ trunk/buildroot/target/squashfs/squashfsroot.mk	2005-08-08 06:57:43 UTC (rev 11056)
@@ -53,13 +53,13 @@
 SQUASHFS_ENDIANNESS=-be
 endif
 
-squashfsroot: squashfs host-fakeroot makedevs
+squashfsroot: host-fakeroot makedevs squashfs
 	- at 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)

Modified: trunk/buildroot/target/tar/tarroot.mk
===================================================================
--- trunk/buildroot/target/tar/tarroot.mk	2005-08-08 00:42:49 UTC (rev 11055)
+++ trunk/buildroot/target/tar/tarroot.mk	2005-08-08 06:57:43 UTC (rev 11056)
@@ -10,11 +10,9 @@
 	- at 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)