From 9a83e4e1b56cd061835a7767897877b87552c06e Mon Sep 17 00:00:00 2001 From: Olof Johansson Date: Fri, 17 Aug 2012 02:45:12 -0700 Subject: [PATCH] update_kernel: update syslinux before module copy Otherwise if you switch architectures during the update (32/64-bit), the module load that's needed to mount the FAT filesystem can't happen (the module has been replaced with the other binary format). BUG=none TEST=run update_kernel on a 32-bit-kernel target after having changed the overlay to use 64-bit kernel. Change-Id: I9f302e777a563cbdab2ec636f9a3b35e39ef9c24 Reviewed-on: https://gerrit.chromium.org/gerrit/30681 Tested-by: Olof Johansson Reviewed-by: Sonny Rao Commit-Ready: Olof Johansson --- update_kernel.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/update_kernel.sh b/update_kernel.sh index 7f48e5d63a..c1da2bf6c9 100755 --- a/update_kernel.sh +++ b/update_kernel.sh @@ -134,14 +134,6 @@ main() { tar -C /build/"${FLAGS_board}"/boot -cjf $TMP/new_boot.tar . remote_sh mount -o remount,rw / - echo "copying modules" - remote_cp_to $TMP/new_modules.tar /tmp/ - remote_sh tar -C /lib/modules -xjf /tmp/new_modules.tar - - echo "copying firmware" - remote_cp_to $TMP/new_firmware.tar /tmp/ - remote_sh tar -C /lib/firmware -xjf /tmp/new_firmware.tar - echo "copying kernel" remote_cp_to $TMP/new_boot.tar /tmp/ remote_sh tar -C /boot -xjf /tmp/new_boot.tar @@ -164,6 +156,14 @@ main() { remote_sh umount /tmp/12 remote_sh rmdir /tmp/12 fi + + echo "copying modules" + remote_cp_to $TMP/new_modules.tar /tmp/ + remote_sh tar -C /lib/modules -xjf /tmp/new_modules.tar + + echo "copying firmware" + remote_cp_to $TMP/new_firmware.tar /tmp/ + remote_sh tar -C /lib/firmware -xjf /tmp/new_firmware.tar fi echo "copying kernel image"