domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

procd: some cleanup for SysupgradeNAND

Browse Source 
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>

SVN-Revision: 41237
This commit is contained in:
John Crispin
2014-06-17 15:40:02 +00:00
parent 575127fe1c
commit 1a3ebd51ad
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/image.mk
View File

@@ -132,14 +132,12 @@ endif
# $(1): board name # $(1): board name
# $(2): kernel image # $(2): kernel image
# $(3): rootfs image # $(3): rootfs image
# $(4): ubi image
ifneq ($(CONFIG_NAND_SUPPORT),) ifneq ($(CONFIG_NAND_SUPPORT),)
define Image/Build/SysupgradeNAND define Image/Build/SysupgradeNAND
mkdir -p $(KDIR_TMP)/sysupgrade-$(1)/ mkdir -p $(KDIR_TMP)/sysupgrade-$(1)/
echo "BOARD=$(1)" > $(KDIR_TMP)/sysupgrade-$(1)/CONTROL echo "BOARD=$(1)" > $(KDIR_TMP)/sysupgrade-$(1)/CONTROL
[ -z "$(2)" ] || $(CP) $(2) $(KDIR_TMP)/sysupgrade-$(1)/kernel [ -z "$(2)" ] || $(CP) $(2) $(KDIR_TMP)/sysupgrade-$(1)/kernel
[ -z "$(3)" ] || $(CP) $(3) $(KDIR_TMP)/sysupgrade-$(1)/root [ -z "$(3)" ] || $(CP) $(3) $(KDIR_TMP)/sysupgrade-$(1)/root
[ -z "$(4)" ] || $(CP) $(4) $(KDIR_TMP)/sysupgrade-$(1)/ubi
(cd $(KDIR_TMP); $(TAR) cvf \ (cd $(KDIR_TMP); $(TAR) cvf \
$(BIN_DIR)/$(IMG_PREFIX)-$(1)-ubi-sysupgrade.tar sysupgrade-$(1)) $(BIN_DIR)/$(IMG_PREFIX)-$(1)-ubi-sysupgrade.tar sysupgrade-$(1))
endef endef

5
package/system/procd/files/nand.sh
View File

@@ -4,8 +4,6 @@
. /lib/functions.sh . /lib/functions.sh
# combined-image uses 64k blocks
CI_BLKSZ=65536
# 'data' partition on NAND contains UBI # 'data' partition on NAND contains UBI
CI_UBIPART="ubi" CI_UBIPART="ubi"
@@ -192,7 +190,7 @@ nand_upgrade_ubinized() {
if [ ! "$mtdnum" ]; then if [ ! "$mtdnum" ]; then
echo "cannot find mtd device $CI_UBIPART" echo "cannot find mtd device $CI_UBIPART"
return 1; reboot -f
fi fi
local mtddev="/dev/mtd${mtdnum}" local mtddev="/dev/mtd${mtdnum}"
@@ -212,7 +210,6 @@ nand_do_upgrade_stage2() {
local kernel_length=`(tar xf $tar_file sysupgrade-$board_name/kernel -O | wc -c) 2> /dev/null` 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 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 rootfs_type="$(identify_tar "$tar_file" root)"