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 | c406bef2d0178fc87afd7de58b4ecf47b447a7df (patch) | |
| tree | fcfa7a2d396b4b498c16c40b120a9903fee5829b /target/linux/ixp4xx | |
| parent | fe97c82a982c1a85325f8ae611e1cfb4744d82c5 (diff) | |
| download | upstream-c406bef2d0178fc87afd7de58b4ecf47b447a7df.tar.gz upstream-c406bef2d0178fc87afd7de58b4ecf47b447a7df.tar.bz2 upstream-c406bef2d0178fc87afd7de58b4ecf47b447a7df.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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39181 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx')
| -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%% *}" |