From: Florian Fainelli <florian@openwrt.org>
Date: Tue, 10 Aug 2010 20:13:49 +0000 (+0000)
Subject: fix Freecom DT2 jffs2 rootfs generation issue (#7584)
X-Git-Tag: reboot~19171
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=b2cb720494b73b120109aab6433c04eaf824daba

fix Freecom DT2 jffs2 rootfs generation issue (#7584)

SVN-Revision: 22585
---

diff --git a/target/linux/orion/image/Makefile b/target/linux/orion/image/Makefile
index 81de135456..16ae4392fc 100644
--- a/target/linux/orion/image/Makefile
+++ b/target/linux/orion/image/Makefile
@@ -79,13 +79,24 @@ define Image/Build/Linksys
 endef
 
 define Image/Build/Freecom
+	# Orion Freecom Images
+ # backup unwanted files
+	rm -rf ${TMP_DIR}/$2_backup
+	mkdir ${TMP_DIR}/$2_backup
+	-mv $(TARGET_DIR)/{var,jffs,rom} ${TMP_DIR}/$2_backup
+ # add extra files
 	$(INSTALL_DIR) $(TARGET_DIR)/boot
 	# TODO: Add special CMDLINE shim for webupgrade image here
 	$(CP) $(KDIR)/dt2-uImage $(TARGET_DIR)/boot/uImage
-	rm -rf $(TARGET_DIR)/{var,jffs,rom}
 	$(INSTALL_DIR) $(TARGET_DIR)/var
+ # create image
 	$(TAR) cfj $(BIN_DIR)/openwrt-$(2)-$(1).img --numeric-owner --owner=0 --group=0 -C $(TARGET_DIR)/ .
 	$(STAGING_DIR_HOST)/bin/encode_crc $(BIN_DIR)/openwrt-$(2)-$(1).img $(BIN_DIR)/openwrt-$(2)-$(1)-webupgrade.img $(3)
+ # remove extra files
+	rm -rf $(TARGET_DIR)/{boot,var}
+ # recover unwanted files
+	-mv ${TMP_DIR}/$2_backup/* $(TARGET_DIR)/
+	rm -rf ${TMP_DIR}/$2_backup
 endef
 
 define Image/Build