commit 64037fa2fc51890bbfceecf54cc34a6538b9852d
author Mike Frysinger <vapier@chromium.org> Thu May 05 00:10:04 2022 -0400
committer Robert Kolchmeyer <rkolchmeyer@google.com> Wed Nov 23 10:30:26 2022 +0000
tree 7926a9a78ef24920515a8c47bcdf7be6ac6242a3
parent 18343232cf9d59adbc6628a067d8d4f07f0ffd9e

eselect python: drop usage

Now that we have newer versions of python-exec, we no longer need to
call eselect python at all.  Control over which versions of Python
are used is determined entirely by python-exec now via USE flags.

BUG=b/257271340
TEST=presubmit
RELEASE_NOTE=None

Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosutils/+/3633065
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Sergey Frolov <sfrolov@google.com>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Change-Id: I1083c188da114a83dc60dc7710d14dc2b18b51fd
Reviewed-on: https://cos-review.googlesource.com/c/third_party/platform/crosutils/+/39187
Reviewed-by: Oleksandr Tymoshenko <ovt@google.com>
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>

build_library/base_image_util.sh

diff --git a/build_library/base_image_util.sh b/build_library/base_image_util.sh
index d152d70..ef44879 100755
--- a/build_library/base_image_util.sh
+++ b/build_library/base_image_util.sh
@@ -358,12 +358,6 @@
     fi
   done
 
-  # If Python is installed in the rootfs, make sure the latest is the default.
-  # If we have multiple versions, there's no guarantee as to which was selected.
-  if [[ -e "${root_fs_dir}/usr/bin/python" ]]; then
-    sudo env ROOT="${root_fs_dir}" eselect python update
-  fi
-
   # Set /etc/lsb-release on the image.
   local official_flag=
   if [[ "${CHROMEOS_OFFICIAL:-0}" == "1" ]]; then

build_library/dev_image_util.sh

diff --git a/build_library/dev_image_util.sh b/build_library/dev_image_util.sh
index 57c17e6..06d1d56 100755
--- a/build_library/dev_image_util.sh
+++ b/build_library/dev_image_util.sh
@@ -34,13 +34,6 @@
   # Install developer packages.
   emerge_to_image --root="${root_dev_dir}" virtual/target-os-dev
 
-  # If Python is installed in the dev image, make sure the latest is the
-  # default.  If we have multiple versions, there's no guarantee as to which
-  # was selected.
-  if [[ -e "${root_dev_dir}/usr/bin/python" ]]; then
-    sudo env ROOT="${root_dev_dir}" eselect python update
-  fi
-
   # Run depmod to recalculate the kernel module dependencies.
   run_depmod "${BOARD_ROOT}" "${root_fs_dir}"