From: luka Date: Mon, 30 Dec 2013 23:49:25 +0000 (+0000) Subject: ixp4xx: upgrade: don't copy extra binaries X-Git-Tag: fast2504n-3.10.28-merged~411 X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=56688626b0626e16f24fd31c16087de5dc98b785;p=openwrt.git ixp4xx: upgrade: don't copy extra binaries hexdump is already added to new temporary file system while less is not used at all. While at it, remove some trailing whitespaces. Signed-off-by: Luka Perkov CC: Imre Kaloz git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39181 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/target/linux/ixp4xx/base-files/lib/upgrade/platform.sh b/target/linux/ixp4xx/base-files/lib/upgrade/platform.sh index 63be29315c..d10d934370 100644 --- a/target/linux/ixp4xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ixp4xx/base-files/lib/upgrade/platform.sh @@ -2,9 +2,6 @@ RAMFS_COPY_DATA="/lib/ixp4xx.sh" -# testing -RAMFS_COPY_BIN="/usr/bin/less /usr/bin/hexdump" - CI_BLKSZ=65536 CI_LDADR=0x00800000 @@ -64,7 +61,7 @@ platform_do_upgrade_combined() { v "kernel_part_size=$kern_part_size" v "kernel_part_blocks=$kern_part_blocks" v "kern_length=$kern_length" - v "erase_size=$erase_size" + v "erase_size=$erase_size" v "kern_blocks=$kern_blocks" v "root_blocks=$root_blocks" v "kern_pad_blocks=$(($kern_part_blocks-$kern_blocks))" @@ -110,7 +107,7 @@ platform_check_image() { if [ $kern_length_b -gt $kern_part_size_b ]; then echo "Invalid image. Kernel size ($kern_length) exceeds kernel partition ($kern_part_size)" return 1 - fi + fi local md5_img=$(dd if="$1" bs=2 skip=9 count=16 2>/dev/null) local md5_chk=$(dd if="$1" bs=$CI_BLKSZ skip=1 2>/dev/null | md5sum -); md5_chk="${md5_chk%% *}"