From 47d28794fa01064f9f123b71a0f9879a356e4bdc Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 28 Feb 2012 16:06:30 -0500 Subject: [PATCH] update hooks: make sure cross-compilers are not in @world There was a bug in the setup_board where it was selecting cross-compilers and adding them to @world. Now that's been fixed, undo the damage. BUG=None TEST=`./update_chroot && grep ^cross- /var/lib/portage/world` showed nothing Change-Id: Ide4961def700cf42d95454cc0ce404cb517bdfea Reviewed-on: https://gerrit.chromium.org/gerrit/16997 Reviewed-by: Brian Harring Commit-Ready: Mike Frysinger Tested-by: Mike Frysinger --- chroot_version_hooks.d/28_deselect_cross_compilers | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 chroot_version_hooks.d/28_deselect_cross_compilers diff --git a/chroot_version_hooks.d/28_deselect_cross_compilers b/chroot_version_hooks.d/28_deselect_cross_compilers new file mode 100644 index 0000000000..1db382ee68 --- /dev/null +++ b/chroot_version_hooks.d/28_deselect_cross_compilers @@ -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. + +# There was a bug in the setup_board script where it added the cross-compilers +# to the @world set. Make sure we don't do that since letting emerge do the +# upgrade rather than crossdev (currently) doesn't work. + +world="/var/lib/portage/world" +if [[ -e ${world} ]] ; then + sudo sed -i '/^cross-/d' "${world}" +fi + +exit 0