package/mtd: don't append jffs2 data multiple times

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27358 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/mtd/Makefile b/package/mtd/Makefile
index dd8b24a..f416d6b 100644 (file)
--- a/package/mtd/Makefile
+++ b/package/mtd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=mtd
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=mtd

-PKG_RELEASE:=15
+PKG_RELEASE:=16

 
 PKG_BUILD_DIR := $(KERNEL_BUILD_DIR)/$(PKG_NAME)
 STAMP_PREPARED := $(STAMP_PREPARED)_$(call confvar,CONFIG_MTD_REDBOOT_PARTS)
 
 PKG_BUILD_DIR := $(KERNEL_BUILD_DIR)/$(PKG_NAME)
 STAMP_PREPARED := $(STAMP_PREPARED)_$(call confvar,CONFIG_MTD_REDBOOT_PARTS)

diff --git a/package/mtd/src/mtd.c b/package/mtd/src/mtd.c
index 7f58165..b335826 100644 (file)
--- a/package/mtd/src/mtd.c
+++ b/package/mtd/src/mtd.c
@@ -409,6 +409,9 @@ resume:
                                /* got an EOF marker - this is the place to add some jffs2 data */
                                skip = mtd_replace_jffs2(mtd, fd, e, jffs2file);
 
                                /* got an EOF marker - this is the place to add some jffs2 data */
                                skip = mtd_replace_jffs2(mtd, fd, e, jffs2file);
 

+                               /* don't add it again */
+                               jffs2file = NULL;
+

                                w += skip;
                                e += skip;
                                skip -= buflen;
                                w += skip;
                                e += skip;
                                skip -= buflen;