summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorINAGAKI Hiroshi2025-01-13 08:30:26 +0000
committerSander Vanheule2025-01-21 17:37:51 +0000
commit5410d1299ebc4ba316bbe16f0d336772731e5245 (patch)
tree55400a7e645dd709ce29444f04d4c402aa8dce93
parentdb0fcc0c8dd4424631931aea5dbb7050fa88d088 (diff)
downloadopenwrt-5410d1299ebc4ba316bbe16f0d336772731e5245.tar.gz
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 <musashino.open@gmail.com> Link: https://github.com/openwrt/openwrt/pull/17593 Signed-off-by: Sander Vanheule <sander@svanheule.net>
-rw-r--r--include/image-commands.mk5
1 files changed, 3 insertions, 2 deletions
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/