diff options
| author | Luka Perkov <luka@openwrt.org> | 2013-12-30 23:49:25 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2013-12-30 23:49:25 +0000 |
| commit | 1df5226b040c74f23ee7d001dc668c4a75c7e16b (patch) | |
| tree | d1c364dd60a8d202a68b1fbd34f3cf9f5073c669 /target/linux/ixp4xx/base-files/lib/upgrade | |
| parent | 6865f1d6b28d4e0d664ea6dd5ea33e031571d7a9 (diff) | |
| download | upstream-1df5226b040c74f23ee7d001dc668c4a75c7e16b.tar.gz upstream-1df5226b040c74f23ee7d001dc668c4a75c7e16b.tar.bz2 upstream-1df5226b040c74f23ee7d001dc668c4a75c7e16b.zip | |
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 <luka@openwrt.org>
CC: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 39181
Diffstat (limited to 'target/linux/ixp4xx/base-files/lib/upgrade')
| -rw-r--r-- | target/linux/ixp4xx/base-files/lib/upgrade/platform.sh | 7 |
1 files changed, 2 insertions, 5 deletions
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%% *}" |