From 3ba74cefcb70c8296f824d4f2340436cc247971f Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 8 Jun 2012 14:45:47 -0400 Subject: [PATCH] update hooks: skip old dirs automatically If we have old dirs (such as a previous migration), we might detect they need migration for ldso too, but their name isn't a valid board. So skip those old dirs, and punt old ldso dirs in case they exist (failed previous upgrade). BUG=None TEST=`./update_chroot` moved my old tegra2_kaen and arm-generic boards away, skipped the old softfloat ones, and deleted the previous ldso moves Change-Id: I9ff316d6de2d9e982f93880426955bb0b49f00a1 Reviewed-on: https://gerrit.chromium.org/gerrit/24890 Commit-Ready: Mike Frysinger Reviewed-by: Mike Frysinger Tested-by: Mike Frysinger --- chroot_version_hooks.d/41_arm_new_hardfp_ldso | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/chroot_version_hooks.d/41_arm_new_hardfp_ldso b/chroot_version_hooks.d/41_arm_new_hardfp_ldso index dd7690b7c9..9499a970d3 100644 --- a/chroot_version_hooks.d/41_arm_new_hardfp_ldso +++ b/chroot_version_hooks.d/41_arm_new_hardfp_ldso @@ -18,9 +18,16 @@ for ldso in /build/*/lib/ld-linux.so.3; do '$1 == "Machine:" && $2 == "ARM" { found=1 } END { exit !found }'; then build=${ldso%/lib/*} board=${build##*/} + if [[ ${board} == *.* ]]; then + # For older dirs that have been migrated, skip them. + continue + fi info "Migrating ${board} to ${board}.old.ldso" info "If you don't need it, please run " info "sudo rm -rf ${build}.old.ldso" + if [[ -e ${build}.old.ldso ]]; then + sudo rm -rf ${build}.old.ldso + fi sudo mv ${build}{,.old.ldso} info "Running setup_board --board=${board}" ~/trunk/src/scripts/setup_board --board=${board} --skip_chroot_upgrade