commit 4cd80b62353d9b71f75557f8ff56b28ea9218473
author Mike Frysinger <vapier@chromium.org> Wed May 04 20:39:01 2022 -0400
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu May 05 16:39:13 2022 +0000
tree 2dabad45f7515a5d88513c705ec545068a355517
parent 9d95ff32535b9453d3f94c34e6f62508078c7d37

sysroot/cros_setup_toolchains: use overlays directly

Rather than create symlinks to stable paths under /mnt/host/source,
use those paths directly so we don't need the symlinks at all.

BUG=b:191307774
TEST=CQ passes

Change-Id: I59acb392a71e73537bd431599c4b8cd8a5ea7217
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3625737
Commit-Queue: Sergey Frolov <sfrolov@google.com>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Sergey Frolov <sfrolov@google.com>
Auto-Submit: Mike Frysinger <vapier@chromium.org>

scripts/cros_setup_toolchains.py

diff --git a/scripts/cros_setup_toolchains.py b/scripts/cros_setup_toolchains.py
index eaead5a..c7a2ff9 100644
--- a/scripts/cros_setup_toolchains.py
+++ b/scripts/cros_setup_toolchains.py
@@ -35,9 +35,12 @@
 EMERGE_CMD = os.path.join(constants.CHROMITE_BIN_DIR, 'parallel_emerge')
 PACKAGE_STABLE = '[stable]'
 
-CHROMIUMOS_OVERLAY = '/usr/local/portage/chromiumos'
-ECLASS_OVERLAY = '/usr/local/portage/eclass-overlay'
-STABLE_OVERLAY = '/usr/local/portage/stable'
+CHROMIUMOS_OVERLAY = os.path.join(
+    constants.CHROOT_SOURCE_ROOT, constants.CHROMIUMOS_OVERLAY_DIR)
+ECLASS_OVERLAY = os.path.join(
+    constants.CHROOT_SOURCE_ROOT, constants.ECLASS_OVERLAY_DIR)
+STABLE_OVERLAY = os.path.join(
+    constants.CHROOT_SOURCE_ROOT, constants.PORTAGE_STABLE_OVERLAY_DIR)
 CROSSDEV_OVERLAY = '/usr/local/portage/crossdev'