au1000: make sysupgrade compatible with all file system types

This patch adds support for all file system types as discussed earlier:

https://lists.openwrt.org/pipermail/openwrt-devel/2013-October/022109.html

This patch depends on a previous patch:

https://lists.openwrt.org/pipermail/openwrt-devel/2013-October/022111.html

Signed-off-by: Philipp Borgers <borgers@mi.fu-berlin.de>
SVN-Revision: 38675

diff --git a/target/linux/au1000/base-files/lib/upgrade/platform.sh b/target/linux/au1000/base-files/lib/upgrade/platform.sh
index 85ab21334775cd811b00a3800e131e7c2cf3b6c2..71744e610bee086efb8c80e6f4bd4463f3dcf413 100644 (file)
--- a/target/linux/au1000/base-files/lib/upgrade/platform.sh
+++ b/target/linux/au1000/base-files/lib/upgrade/platform.sh
@@ -1,5 +1,5 @@
 KERNEL_IMG="openwrt-au1000-au1500-vmlinux.bin"
-ROOTFS_IMG="openwrt-au1000-au1500-jffs2-128k.fs"
+ROOTFS_IMG="openwrt-au1000-au1500-root.fs"
 
 platform_check_image() {
        [ "$ARGC" -gt 1 ] && return 1

diff --git a/target/linux/au1000/image/Makefile b/target/linux/au1000/image/Makefile
index 12c84a10cf0616eb6678c9e9805b3cb309c31430..63c0b03d682d74394a6e4f51603b99632b61956d 100644 (file)
--- a/target/linux/au1000/image/Makefile
+++ b/target/linux/au1000/image/Makefile
@@ -62,7 +62,9 @@ define Image/Build
        $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(1).fs
        $(CP) $(KDIR)/kernel.flash.srec $(BIN_DIR)/$(IMG_PREFIX)-vmlinux-flash.srec
        $(CP) $(KDIR)/kernel.ram.srec $(BIN_DIR)/$(IMG_PREFIX)-vmlinux-ram.srec
-       tar -C $(BIN_DIR) -cvzf $(BIN_DIR)/$(IMG_PREFIX)-$(1)-sysupgrade.bin $(IMG_PREFIX)-vmlinux.bin $(IMG_PREFIX)-$(1).fs
+       $(CP) $(BIN_DIR)/$(IMG_PREFIX)-$(1).fs $(TMP_DIR)/$(IMG_PREFIX)-root.fs
+       tar -C $(BIN_DIR) -cvzf $(BIN_DIR)/$(IMG_PREFIX)-$(1)-sysupgrade.bin \
+               $(IMG_PREFIX)-vmlinux.bin -C $(TMP_DIR) $(IMG_PREFIX)-root.fs
 ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
        $(call Image/Build/Initramfs)
 endif