From f2a32fff7d2089082e11f0e8ebfaef6159994338 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Sun, 22 Jul 2007 18:29:59 +0000 Subject: [PATCH] fix jffs2 images SVN-Revision: 8107 --- include/image.mk | 13 +++++++------ 1 file 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