From 650bf873cdd953b5582a4c8f6cb8d49711aaa30f Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@chromium.org>
Date: Mon, 27 Feb 2012 11:05:26 -0500
Subject: [PATCH] use --select for our core packages

We are changing the default emerge options to use --oneshot, so make sure
our scripts select the packages we care about for @world.

BUG=None
TEST=setup_board+build_packages for tegra2 adds pkgs to world

Change-Id: I5fc68c538a1a1c846bd9724f27ef717029d11d42
Reviewed-on: https://gerrit.chromium.org/gerrit/16838
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
---
 build_packages         |  2 +-
 sdk_lib/make_chroot.sh |  2 +-
 setup_board            | 17 +++++++++--------
 update_chroot          |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/build_packages b/build_packages
index 87e98592c5..631ef0522f 100755
--- a/build_packages
+++ b/build_packages
@@ -91,7 +91,7 @@ if [[ -z "${FLAGS_board}" ]]; then
   exit 1
 fi
 
-EMERGE_FLAGS="--backtrack=30"
+EMERGE_FLAGS="--backtrack=30 --select"
 
 EMERGE_CMD="emerge"
 EMERGE_BOARD_CMD="emerge-${FLAGS_board}"
diff --git a/sdk_lib/make_chroot.sh b/sdk_lib/make_chroot.sh
index 10fe1f5beb..34917935e3 100755
--- a/sdk_lib/make_chroot.sh
+++ b/sdk_lib/make_chroot.sh
@@ -431,7 +431,7 @@ info "Deselecting dhcpcd"
 early_enter_chroot $EMERGE_CMD --deselect dhcpcd
 
 info "Running emerge ccache curl sudo ..."
-early_enter_chroot $EMERGE_CMD -uNv $USEPKG $EMERGE_JOBS \
+early_enter_chroot $EMERGE_CMD -uNv $USEPKG --select $EMERGE_JOBS \
   ccache net-misc/curl sudo
 
 # Curl is now installed, so we can depend on it now.
diff --git a/setup_board b/setup_board
index bb301aceea..8908c23e55 100755
--- a/setup_board
+++ b/setup_board
@@ -651,14 +651,6 @@ exec cros_workon --board ${BOARD_VARIANT} "\$@"
 EOF
 sudo chmod +x "$CROS_WORKON_WRAPPER"
 
-#
-# Emerge the kernel headers into the board build root.
-#
-EMERGE_FLAGS=""
-if [[ $FLAGS_usepkg -eq $FLAGS_TRUE ]]; then
-  EMERGE_FLAGS="${EMERGE_FLAGS} --getbinpkg --usepkg"
-fi
-
 if ${HOST_BOARD}; then
   EMERGE_CMD="emerge"
   if [[ $FLAGS_fast -eq $FLAGS_TRUE ]]; then
@@ -674,6 +666,7 @@ if ${HOST_BOARD}; then
   # Next, install our rebuilt packages into our separate root.
   HOST_FLAGS="--root=$BOARD_ROOT --update --verbose --deep --root-deps"
   HOST_FLAGS+=" --with-bdeps=y --newuse --jobs=$NUM_JOBS --usepkgonly"
+  HOST_FLAGS+=" --select"
   sudo -E $EMERGE_CMD $HOST_FLAGS $PACKAGES
   sudo cp -a "${PKGDIR}" $BOARD_ROOT/packages
 
@@ -715,6 +708,14 @@ if ${HOST_BOARD}; then
   sudo find $BOARD_ROOT -type f -name '*.la' | xargs sudo \
       sed -i -e "s|$BOARD_ROOT/|/|g"
 else
+  #
+  # Emerge the kernel headers into the board build root.
+  #
+  EMERGE_FLAGS="--select"
+  if [[ $FLAGS_usepkg -eq $FLAGS_TRUE ]]; then
+    EMERGE_FLAGS+=" --getbinpkg --usepkg"
+  fi
+
   sudo -E "${EMERGE_WRAPPER}" ${EMERGE_FLAGS} chromeos-base/kernel-headers
 fi
 
diff --git a/update_chroot b/update_chroot
index 8a271c3959..2c548ce6e0 100755
--- a/update_chroot
+++ b/update_chroot
@@ -44,7 +44,7 @@ fi | sudo_clobber "$PREBUILT_SETUP"
 
 info "Updating chroot"
 
-EMERGE_FLAGS="-uNv --with-bdeps=y"
+EMERGE_FLAGS="-uNv --with-bdeps=y --select"
 if [ "${FLAGS_usepkg}" -eq "${FLAGS_TRUE}" ]; then
   EMERGE_FLAGS="${EMERGE_FLAGS} --getbinpkg"