Author: blogic Date: 2014-06-17 17:40:02 +0200 (Tue, 17 Jun 2014) New Revision: 41237
Modified: trunk/include/image.mk trunk/package/system/procd/files/nand.sh Log: 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 <[email protected]> Modified: trunk/include/image.mk =================================================================== --- trunk/include/image.mk 2014-06-17 15:38:54 UTC (rev 41236) +++ trunk/include/image.mk 2014-06-17 15:40:02 UTC (rev 41237) @@ -132,14 +132,12 @@ # $(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 Modified: trunk/package/system/procd/files/nand.sh =================================================================== --- trunk/package/system/procd/files/nand.sh 2014-06-17 15:38:54 UTC (rev 41236) +++ trunk/package/system/procd/files/nand.sh 2014-06-17 15:40:02 UTC (rev 41237) @@ -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 @@ if [ ! "$mtdnum" ]; then echo "cannot find mtd device $CI_UBIPART" - return 1; + reboot -f fi local mtddev="/dev/mtd${mtdnum}" @@ -212,10 +210,9 @@ 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 _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
