diff options
| author | John Crispin <blogic@openwrt.org> | 2014-06-17 15:40:02 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2014-06-17 15:40:02 +0000 |
| commit | 31f99ff64c0f013dfbdbc5267b96d21190b41219 (patch) | |
| tree | d03fde9bd72d9be222ac77d60b95bf9e7c167e27 | |
| parent | 7911faae005a1945f399da4f92130eea8921f34c (diff) | |
| download | master-187ad058-31f99ff64c0f013dfbdbc5267b96d21190b41219.tar.gz master-187ad058-31f99ff64c0f013dfbdbc5267b96d21190b41219.tar.bz2 master-187ad058-31f99ff64c0f013dfbdbc5267b96d21190b41219.zip | |
procd: some cleanup for SysupgradeNAND
Removed unused ubi file file from template as ubinized images are
passed directly and not inside the tarball.
Also removed left-over white-space.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41237 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/image.mk | 2 | ||||
| -rw-r--r-- | package/system/procd/files/nand.sh | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/include/image.mk b/include/image.mk index 605474ce99..66ac497849 100644 --- a/include/image.mk +++ b/include/image.mk @@ -132,14 +132,12 @@ endif # $(1): board name # $(2): kernel image # $(3): rootfs image -# $(4): ubi image ifneq ($(CONFIG_NAND_SUPPORT),) define Image/Build/SysupgradeNAND mkdir -p $(KDIR_TMP)/sysupgrade-$(1)/ echo "BOARD=$(1)" > $(KDIR_TMP)/sysupgrade-$(1)/CONTROL [ -z "$(2)" ] || $(CP) $(2) $(KDIR_TMP)/sysupgrade-$(1)/kernel [ -z "$(3)" ] || $(CP) $(3) $(KDIR_TMP)/sysupgrade-$(1)/root - [ -z "$(4)" ] || $(CP) $(4) $(KDIR_TMP)/sysupgrade-$(1)/ubi (cd $(KDIR_TMP); $(TAR) cvf \ $(BIN_DIR)/$(IMG_PREFIX)-$(1)-ubi-sysupgrade.tar sysupgrade-$(1)) endef diff --git a/package/system/procd/files/nand.sh b/package/system/procd/files/nand.sh index 0b58a0313d..9131ddaa7b 100644 --- a/package/system/procd/files/nand.sh +++ b/package/system/procd/files/nand.sh @@ -4,8 +4,6 @@ . /lib/functions.sh -# combined-image uses 64k blocks -CI_BLKSZ=65536 # 'data' partition on NAND contains UBI CI_UBIPART="ubi" @@ -192,7 +190,7 @@ nand_upgrade_ubinized() { if [ ! "$mtdnum" ]; then echo "cannot find mtd device $CI_UBIPART" - return 1; + reboot -f fi local mtddev="/dev/mtd${mtdnum}" @@ -212,10 +210,9 @@ nand_do_upgrade_stage2() { local kernel_length=`(tar xf $tar_file sysupgrade-$board_name/kernel -O | wc -c) 2> /dev/null` local rootfs_length=`(tar xf $tar_file sysupgrade-$board_name/root -O | wc -c) 2> /dev/null` - local ubi_length=`(tar xf $tar_file sysupgrade-$board_name/ubi -O | wc -c) 2> /dev/null` - + local rootfs_type="$(identify_tar "$tar_file" root)" - + local has_kernel=1 local has_env=0 |