backport r22585 to backfire, thanks maddes

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@22586 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/orion/image/Makefile b/target/linux/orion/image/Makefile
index 81de135456f6bde2b4c6512eda2e96ba117b45bf..16ae4392fce0b0a4d81422659c10d7273f4c54de 100644 (file)
--- 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