Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] svn commit: trunk/buildroot/target: cloop ext2
@ 2007-06-16 17:55 sjhill at uclibc.org
  2007-06-17  5:11 ` Heikki Lindholm
  0 siblings, 1 reply; 2+ messages in thread
From: sjhill at uclibc.org @ 2007-06-16 17:55 UTC (permalink / raw)
  To: buildroot

Author: sjhill
Date: 2007-06-16 10:55:32 -0700 (Sat, 16 Jun 2007)
New Revision: 18834

Log:
Get rid of extra directory entries.


Modified:
   trunk/buildroot/target/cloop/cloop.mk
   trunk/buildroot/target/ext2/ext2root.mk


Changeset:
Modified: trunk/buildroot/target/cloop/cloop.mk
===================================================================
--- trunk/buildroot/target/cloop/cloop.mk	2007-06-16 17:55:05 UTC (rev 18833)
+++ trunk/buildroot/target/cloop/cloop.mk	2007-06-16 17:55:32 UTC (rev 18834)
@@ -77,6 +77,7 @@
 	@rm -rf $(TARGET_DIR)/usr/man
 	@rm -rf $(TARGET_DIR)/usr/share/man
 	@rm -rf $(TARGET_DIR)/usr/info
+	@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) $(IMAGE).cloop
 	## mkisofs -r $(TARGET_DIR) | $(CLOOP_DIR)/create_compressed_fs - 65536 > $(IMAGE).cloop
 	sudo /sbin/losetup -d /dev/loop1

Modified: trunk/buildroot/target/ext2/ext2root.mk
===================================================================
--- trunk/buildroot/target/ext2/ext2root.mk	2007-06-16 17:55:05 UTC (rev 18833)
+++ trunk/buildroot/target/ext2/ext2root.mk	2007-06-16 17:55:32 UTC (rev 18834)
@@ -91,6 +91,7 @@
 	@rm -rf $(TARGET_DIR)/usr/man
 	@rm -rf $(TARGET_DIR)/usr/share/man
 	@rm -rf $(TARGET_DIR)/usr/info
+	@rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share
 	-/sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null
 	# Use fakeroot to pretend all target binaries are owned by root
 	rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))

^ permalink raw reply	[flat|nested] 2+ messages in thread

* [Buildroot] svn commit: trunk/buildroot/target: cloop ext2
  2007-06-16 17:55 [Buildroot] svn commit: trunk/buildroot/target: cloop ext2 sjhill at uclibc.org
@ 2007-06-17  5:11 ` Heikki Lindholm
  0 siblings, 0 replies; 2+ messages in thread
From: Heikki Lindholm @ 2007-06-17  5:11 UTC (permalink / raw)
  To: buildroot

sjhill at uclibc.org kirjoitti:
> Author: sjhill
> Date: 2007-06-16 10:55:32 -0700 (Sat, 16 Jun 2007)
> New Revision: 18834
> 
> Log:
> Get rid of extra directory entries.
> 
> 
> Modified:
>    trunk/buildroot/target/cloop/cloop.mk
>    trunk/buildroot/target/ext2/ext2root.mk
> 
> 
> Changeset:
> Modified: trunk/buildroot/target/cloop/cloop.mk
> ===================================================================
> --- trunk/buildroot/target/cloop/cloop.mk	2007-06-16 17:55:05 UTC (rev 18833)
> +++ trunk/buildroot/target/cloop/cloop.mk	2007-06-16 17:55:32 UTC (rev 18834)
> @@ -77,6 +77,7 @@
>  	@rm -rf $(TARGET_DIR)/usr/man
>  	@rm -rf $(TARGET_DIR)/usr/share/man
>  	@rm -rf $(TARGET_DIR)/usr/info
> +	@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) $(IMAGE).cloop
>  	## mkisofs -r $(TARGET_DIR) | $(CLOOP_DIR)/create_compressed_fs - 65536 > $(IMAGE).cloop
>  	sudo /sbin/losetup -d /dev/loop1
> 
> Modified: trunk/buildroot/target/ext2/ext2root.mk
> ===================================================================
> --- trunk/buildroot/target/ext2/ext2root.mk	2007-06-16 17:55:05 UTC (rev 18833)
> +++ trunk/buildroot/target/ext2/ext2root.mk	2007-06-16 17:55:32 UTC (rev 18834)
> @@ -91,6 +91,7 @@
>  	@rm -rf $(TARGET_DIR)/usr/man
>  	@rm -rf $(TARGET_DIR)/usr/share/man
>  	@rm -rf $(TARGET_DIR)/usr/info
> +	@rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share
>  	-/sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null
>  	# Use fakeroot to pretend all target binaries are owned by root
>  	rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))

Ugh, more GNUisms. Could we perhaps find a POSIX way of doing these?

-- Heikki Lindholm

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2007-06-17  5:11 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-06-16 17:55 [Buildroot] svn commit: trunk/buildroot/target: cloop ext2 sjhill at uclibc.org
2007-06-17  5:11 ` Heikki Lindholm

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox