From 07feaa5736d980bbb64d3c2eb69f9c47094d7e15 Mon Sep 17 00:00:00 2001 From: "\"Steven J. Hill\"" Date: Sat, 16 Jun 2007 17:56:05 +0000 Subject: Get rid of extra directory entry in JFFS2 and add wildcarding for usbmount patches. --- package/usbmount/usbmount.mk | 2 +- target/jffs2/jffs2root.mk | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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)) -- cgit v1.2.3