commit 697ab96d1c11872dce48770d8a4cf1047a718939
author Mike Frysinger <vapier@chromium.org> Mon Nov 04 20:02:43 2019 -0500
committer Mike Frysinger <vapier@chromium.org> Thu Nov 07 06:48:34 2019 +0000
tree bedb85b7085935bca26e75c5aab1705079103262
parent bec7c55e6d1607af5259ad791457e3686f96a015

drop --select usage

This flag records packages in the @world set, but we don't use that
concept in CrOS, nor do we need it.  Drop it everywhere.

BUG=None
TEST=CQ passes

Change-Id: I04913afe2e00f7f72dec57a51035f015c05710d3
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosutils/+/1898558
Reviewed-by: Chris McDonald <cjmcdonald@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

build_packages

diff --git a/build_packages b/build_packages
index 2b058c3..f432be9 100755
--- a/build_packages
+++ b/build_packages
@@ -177,7 +177,7 @@
 
 
 # Setup all the emerge command/flags.
-EMERGE_FLAGS=( -uDNv --backtrack=30 --select --newrepo )
+EMERGE_FLAGS=( -uDNv --backtrack=30 --newrepo )
 
 EMERGE_CMD=(
   "${CHROMITE_BIN}/parallel_emerge"

build_sdk_board

diff --git a/build_sdk_board b/build_sdk_board
index 8efc674..154618f 100755
--- a/build_sdk_board
+++ b/build_sdk_board
@@ -141,7 +141,7 @@
 # Next, install our rebuilt packages into our separate root.
 HOST_FLAGS="--root=$BOARD_ROOT --update --verbose --deep --root-deps"
 HOST_FLAGS+=" --newuse --usepkgonly"
-sudo -E $EMERGE_CMD $HOST_FLAGS --with-bdeps=y --select=y "${PACKAGES[@]}"
+sudo -E $EMERGE_CMD $HOST_FLAGS --with-bdeps=y "${PACKAGES[@]}"
 # Install our rebuilt packages from the nobdeps target into our separate root
 # without their build-time deps.  We also avoid adding this target to the
 # world set so that subsequent update_chroot commands won't re-import the

sdk_lib/make_chroot.sh

diff --git a/sdk_lib/make_chroot.sh b/sdk_lib/make_chroot.sh
index ac955ed..34a44cb 100755
--- a/sdk_lib/make_chroot.sh
+++ b/sdk_lib/make_chroot.sh
@@ -617,7 +617,7 @@
 #   older sys-devel/automake makes media-libs/freetype build flaky.
 #   glibc 2.26+ needs a newer bison.
 info "Updating preinstalled build tools"
-early_enter_chroot ${EMERGE_CMD} -uNv ${USEPKG} --select ${EMERGE_JOBS} \
+early_enter_chroot ${EMERGE_CMD} -uNv ${USEPKG} ${EMERGE_JOBS} \
   sys-apps/sandbox '>=sys-devel/patch-2.7' sys-devel/automake sys-devel/bison
 
 # Now that many of the fundamental packages should be in a good state, update
@@ -648,7 +648,7 @@
     --hostonly "${TOOLCHAIN_ARGS[@]}"
 
 info "Running emerge curl sudo gentoolkit ..."
-early_enter_chroot ${EMERGE_CMD} -uNv ${USEPKG} --select ${EMERGE_JOBS} \
+early_enter_chroot ${EMERGE_CMD} -uNv ${USEPKG} ${EMERGE_JOBS} \
   pbzip2 dev-libs/openssl net-misc/curl sudo app-portage/gentoolkit
 
 info "Updating Perl modules"

update_chroot

diff --git a/update_chroot b/update_chroot
index dc3aae8..01bd546 100755
--- a/update_chroot
+++ b/update_chroot
@@ -114,7 +114,7 @@
 # Perform an update of all the sdk packages in the chroot.
 EMERGE_CMD="${CHROMITE_BIN}/parallel_emerge"
 
-EMERGE_FLAGS=( -uNv --with-bdeps=y --select )
+EMERGE_FLAGS=( -uNv --with-bdeps=y )
 if [ "${FLAGS_usepkg}" -eq "${FLAGS_TRUE}" ]; then
   EMERGE_FLAGS+=( --getbinpkg )