aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2007-07-22 18:29:59 +0000
committerNicolas Thill <nico@openwrt.org>2007-07-22 18:29:59 +0000
commitf2a32fff7d2089082e11f0e8ebfaef6159994338 (patch)
treebe2ac01e9c36f43f250919703c2080670514d545
parent6330c58b584a0a5948e2403d27e2a2728386941f (diff)
downloadupstream-f2a32fff7d2089082e11f0e8ebfaef6159994338.tar.gz
upstream-f2a32fff7d2089082e11f0e8ebfaef6159994338.tar.bz2
upstream-f2a32fff7d2089082e11f0e8ebfaef6159994338.zip
fix jffs2 images
SVN-Revision: 8107
-rw-r--r--include/image.mk13
1 files changed, 7 insertions, 6 deletions
diff --git a/include/image.mk b/include/image.mk
index 5fc87efa1d..a421edd97f 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -35,14 +35,15 @@ endef
ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
ifeq ($(CONFIG_TARGET_ROOTFS_JFFS2),y)
+ define Image/mkfs/jffs2/sub
+ @# FIXME: removing this line will cause the foreach loop below to execute the next statement only on the first iteration, don't ask why ;)
+ $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e $(patsubst %k,%KiB,$(1)) -o $(KDIR)/root.jffs2-$(1) -d $(BUILD_DIR)/root
+ $(call add_jffs2_mark,$(KDIR)/root.jffs2-$(1))
+ $(call Image/Build,jffs2-$(1))
+ endef
define Image/mkfs/jffs2
rm -rf $(BUILD_DIR)/root/jffs
-
- $(foreach SZ,$(JFFS2_BLOCKSIZE),\
- $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e $(patsubst %k,%KiB,$(SZ)) -o $(KDIR)/root.jffs2-$(SZ) -d $(BUILD_DIR)/root; \
- $(call add_jffs2_mark,$(KDIR)/root.jffs2-$(SZ)); \
- $(call Image/Build,jffs2-$(SZ)) \
- )
+ $(foreach SZ,$(JFFS2_BLOCKSIZE),$(call Image/mkfs/jffs2/sub,$(SZ)))
endef
endif