ixp4xx: upgrade: don't copy extra binaries
authorluka <luka@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Mon, 30 Dec 2013 23:49:25 +0000 (23:49 +0000)
committerluka <luka@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Mon, 30 Dec 2013 23:49:25 +0000 (23:49 +0000)
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

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

index 63be293..d10d934 100644 (file)
@@ -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%% *}"