summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author"Steven J. Hill" <sjhill@realitydiluted.com>2007-06-16 17:56:05 +0000
committer"Steven J. Hill" <sjhill@realitydiluted.com>2007-06-16 17:56:05 +0000
commit07feaa5736d980bbb64d3c2eb69f9c47094d7e15 (patch)
treeacb2e8a27fc2633271c84e6befee3461e72bb563
parentd04f3b5aaf09d3a981194fbe0d60738eaf439b76 (diff)
Get rid of extra directory entry in JFFS2 and add wildcarding for usbmount patches.
-rw-r--r--package/usbmount/usbmount.mk2
-rw-r--r--target/jffs2/jffs2root.mk1
2 files changed, 2 insertions, 1 deletions
diff --git a/package/usbmount/usbmount.mk b/package/usbmount/usbmount.mk
index a769378de..529f105b1 100644
--- a/package/usbmount/usbmount.mk
+++ b/package/usbmount/usbmount.mk
@@ -18,7 +18,7 @@ usbmount-source: $(DL_DIR)/$(USBMOUNT_SOURCE)
$(USBMOUNT_DIR)/.unpacked: $(DL_DIR)/$(USBMOUNT_SOURCE)
$(USBMOUNT_CAT) $(DL_DIR)/$(USBMOUNT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(USBMOUNT_DIR) package/usbmount usbmount-$(USBMOUNT_VERSION).patch
+ toolchain/patch-kernel.sh $(USBMOUNT_DIR) package/usbmount usbmount-$(USBMOUNT_VERSION)*.patch
touch $@
$(TARGET_DIR)/$(USBMOUNT_TARGET_BINARY): $(USBMOUNT_DIR)/.unpacked
diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk
index 5e9cc1dda..2df5de8b3 100644
--- a/target/jffs2/jffs2root.mk
+++ b/target/jffs2/jffs2root.mk
@@ -53,6 +53,7 @@ $(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
+ @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 $(JFFS2_TARGET))