hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
owl
Luka Perkov 2013-12-30 23:49:25 +00:00
parent 6865f1d6b2
commit 1df5226b04
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
target/linux/ixp4xx/base-files/lib/upgrade/platform.sh
View File

@ -2,9 +2,6 @@
RAMFS_COPY_DATA="/lib/ixp4xx.sh" RAMFS_COPY_DATA="/lib/ixp4xx.sh"
# testing
RAMFS_COPY_BIN="/usr/bin/less /usr/bin/hexdump"
CI_BLKSZ=65536 CI_BLKSZ=65536
CI_LDADR=0x00800000 CI_LDADR=0x00800000
@ -64,7 +61,7 @@ platform_do_upgrade_combined() {
v "kernel_part_size=$kern_part_size" v "kernel_part_size=$kern_part_size"
v "kernel_part_blocks=$kern_part_blocks" v "kernel_part_blocks=$kern_part_blocks"
v "kern_length=$kern_length" v "kern_length=$kern_length"
v "erase_size=$erase_size" v "erase_size=$erase_size"
v "kern_blocks=$kern_blocks" v "kern_blocks=$kern_blocks"
v "root_blocks=$root_blocks" v "root_blocks=$root_blocks"
v "kern_pad_blocks=$(($kern_part_blocks-$kern_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 if [ $kern_length_b -gt $kern_part_size_b ]; then
echo "Invalid image. Kernel size ($kern_length) exceeds kernel partition ($kern_part_size)" echo "Invalid image. Kernel size ($kern_length) exceeds kernel partition ($kern_part_size)"
return 1 return 1
fi fi
local md5_img=$(dd if="$1" bs=2 skip=9 count=16 2>/dev/null) 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%% *}" local md5_chk=$(dd if="$1" bs=$CI_BLKSZ skip=1 2>/dev/null | md5sum -); md5_chk="${md5_chk%% *}"