Commit 07feaa57 authored by "Steven J. Hill"'s avatar "Steven J. Hill"
Browse files

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

parent d04f3b5a

package/usbmount/usbmount.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

target/jffs2/jffs2root.mk

+1 −0
Original line number Diff line number Diff line
@@ -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))