Get rid of extra directory entry in JFFS2 and add wildcarding for usbmount patches.

diff --git a/package/usbmount/usbmount.mk b/package/usbmount/usbmount.mk
index a769378de4aab21e0c60e7f91c10e2b5df2379f3..529f105b143682393519ce8070ed66aa2b28990c 100644 (file)
--- 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 5e9cc1ddacb8d6e693e4e7efd5194fe1666c4815..2df5de8b321c0e367aca987d2c0f9a297c4655bf 100644 (file)
--- 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))