From 9c7eff8fca09d3f83fb9336f8ab5b344a4b31c32 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 8 Jun 2012 17:07:41 -0400 Subject: [PATCH] update hooks: add an upgrade for stale daisy The daisy PFQ did not regenerate itself, so for people who tried to build daisy again, they got a mix of stale binpkgs. Now that things have been manually cleaned up, we can deploy another upgrade hook just for daisy. BUG=None TEST=`./update_chroot` w/out daisy ran quick -> nothing to do TEST=`./update_chroot` w/up-to-date daisy ran quick -> nothing to do TEST=`./update_chroot` w/out-of-date daisy -> deleted & re-installed daisy Change-Id: Id707a492f9cea7fb4c8b204d84c4fc3bca84c4b3 Reviewed-on: https://gerrit.chromium.org/gerrit/24908 Reviewed-by: David James Tested-by: Mike Frysinger Commit-Ready: Mike Frysinger --- .../42_arm_new_hardfp_ldso_daisy | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 chroot_version_hooks.d/42_arm_new_hardfp_ldso_daisy diff --git a/chroot_version_hooks.d/42_arm_new_hardfp_ldso_daisy b/chroot_version_hooks.d/42_arm_new_hardfp_ldso_daisy new file mode 100644 index 0000000000..7febd2e9cf --- /dev/null +++ b/chroot_version_hooks.d/42_arm_new_hardfp_ldso_daisy @@ -0,0 +1,14 @@ +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# Like 41_arm_new_hardfp_ldso, but specifically for daisy. The daisy +# PFQ did not regenerate its binpkgs properly, so some people still have +# old ldso's in /build/ as they pulled down stale binpkgs. + +if scanelf -qRiy /build/daisy/ 2>/dev/null | grep -q '^/lib/ld-linux.so.3'; then + info "You have a stale daisy build; punting!" + sudo rm -rf /build/daisy/ + info "Running setup_board --board=daisy" + ~/trunk/src/scripts/setup_board --board=daisy --skip_chroot_upgrade +fi