summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2013-11-07 12:46:16 +0000
committerJohn Crispin <john@openwrt.org>2013-11-07 12:46:16 +0000
commita100fd3b4a4adc136f73c8466abf0aec8d2ba169 (patch)
tree64f8c2efd47c7558e49abf01cce36177eefe2370
parent8247d9926af6357c872755098f4b37067d274dcb (diff)
downloadmtk-20170518-a100fd3b4a4adc136f73c8466abf0aec8d2ba169.zip
mtk-20170518-a100fd3b4a4adc136f73c8466abf0aec8d2ba169.tar.gz
mtk-20170518-a100fd3b4a4adc136f73c8466abf0aec8d2ba169.tar.bz2
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
-rw-r--r--target/linux/au1000/base-files/lib/upgrade/platform.sh2
-rw-r--r--target/linux/au1000/image/Makefile4
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 85ab213..71744e6 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 12c84a1..63c0b03 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