diff options
| author | Nicolas Thill <nico@openwrt.org> | 2007-07-22 18:29:59 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2007-07-22 18:29:59 +0000 |
| commit | f6aff55a07c7a6fb6c6bf38089c2865123015dec (patch) | |
| tree | fc949079140454752deb7f447be321e0f63fd2c7 /include | |
| parent | b1e1d374683959ce4f44d5bced3e7317d7d49c3f (diff) | |
| download | upstream-f6aff55a07c7a6fb6c6bf38089c2865123015dec.tar.gz upstream-f6aff55a07c7a6fb6c6bf38089c2865123015dec.tar.bz2 upstream-f6aff55a07c7a6fb6c6bf38089c2865123015dec.zip | |
fix jffs2 images
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8107 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
| -rw-r--r-- | include/image.mk | 13 |
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 |