From: INAGAKI Hiroshi Date: Mon, 13 Jan 2025 08:30:26 +0000 (+0900) Subject: build: add additional parameter support to Build/jffs2 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5410d1299ebc4ba316bbe16f0d336772731e5245;p=openwrt%2Fopenwrt.git build: add additional parameter support to Build/jffs2 Allow specifying additional parameters on Build/jffs2. This is useful to specify additional options or overriding existing ones. Signed-off-by: INAGAKI Hiroshi Link: https://github.com/openwrt/openwrt/pull/17593 Signed-off-by: Sander Vanheule --- diff --git a/include/image-commands.mk b/include/image-commands.mk index aa48e19399..030cd17dd8 100644 --- a/include/image-commands.mk +++ b/include/image-commands.mk @@ -438,13 +438,14 @@ endef define Build/jffs2 rm -rf $(KDIR_TMP)/$(DEVICE_NAME)/jffs2 && \ - mkdir -p $(KDIR_TMP)/$(DEVICE_NAME)/jffs2/$$(dirname $(1)) && \ - cp $@ $(KDIR_TMP)/$(DEVICE_NAME)/jffs2/$(1) && \ + mkdir -p $(KDIR_TMP)/$(DEVICE_NAME)/jffs2/$$(dirname $(word 1,$(1))) && \ + cp $@ $(KDIR_TMP)/$(DEVICE_NAME)/jffs2/$(word 1,$(1)) && \ $(STAGING_DIR_HOST)/bin/mkfs.jffs2 --pad \ $(if $(CONFIG_BIG_ENDIAN),--big-endian,--little-endian) \ --squash-uids -v -e $(patsubst %k,%KiB,$(BLOCKSIZE)) \ -o $@.new \ -d $(KDIR_TMP)/$(DEVICE_NAME)/jffs2 \ + $(wordlist 2,$(words $(1)),$(1)) \ 2>&1 1>/dev/null | awk '/^.+$$$$/' && \ $(STAGING_DIR_HOST)/bin/padjffs2 $@.new -J $(patsubst %k,,$(BLOCKSIZE)) -rm -rf $(KDIR_TMP)/$(DEVICE_NAME)/jffs2/