From 6ba5d2dd2978a9a753c834ec2fd2adb901eeb282 Mon Sep 17 00:00:00 2001
From: John Crispin <blogic@openwrt.org>
Date: Thu, 7 Nov 2013 12:46:16 +0000
Subject: 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38675 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/au1000/base-files/lib/upgrade/platform.sh | 2 +-
 target/linux/au1000/image/Makefile                     | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/target/linux/au1000/base-files/lib/upgrade/platform.sh b/target/linux/au1000/base-files/lib/upgrade/platform.sh
index 85ab213347..71744e610b 100644
--- 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 12c84a10cf..63c0b03d68 100644
--- 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
-- 
cgit v1.2.3