Get rid of extra directory entries.

diff --git a/target/cloop/cloop.mk b/target/cloop/cloop.mk
index 8484ffedd631844f79feca4756ae93c24cff5e74..ca6d8bd4a53f1e8223fe95d39969f0db6b0fe5f8 100644 (file)
--- a/target/cloop/cloop.mk
+++ b/target/cloop/cloop.mk
@@ -77,6 +77,7 @@ clooproot: cloop check-tools $(IMAGE).cramfs ### cramfsroot
        @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

diff --git a/target/ext2/ext2root.mk b/target/ext2/ext2root.mk
index 600cf134bed7b297223d76dbbee4da4f5f5caa5e..08a407eab54b12ac90c2a043b6fb1123d93ba48c 100644 (file)
--- a/target/ext2/ext2root.mk
+++ b/target/ext2/ext2root.mk
@@ -91,6 +91,7 @@ $(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
+       @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))