cros_setup_toolchains: list i686-cros-linux-gnu as part of llvm
We're renaming -pc- to -cros-.
BUG=b:187786439
TEST=CQ passes
Change-Id: Ic799a104d0f5286c164ef9a473c3e5c32fe388e6
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3268709
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
diff --git a/scripts/cros_setup_toolchains.py b/scripts/cros_setup_toolchains.py
index 6e37ea1..41a1df0 100644
--- a/scripts/cros_setup_toolchains.py
+++ b/scripts/cros_setup_toolchains.py
@@ -100,6 +100,7 @@
'armv7a-cros-linux-gnueabi',
'armv7a-cros-linux-gnueabihf',
'aarch64-cros-linux-gnu',
+ 'i686-cros-linux-gnu',
'i686-pc-linux-gnu',
'x86_64-cros-linux-gnu',
)
@@ -364,7 +365,7 @@
"""Extracts the current stable version for a given package.
Args:
- atom: The target/package to operate on eg. i686-pc-linux-gnu,gcc
+ atom: The target/package to operate on e.g. i686-cros-linux-gnu/gcc
installed: Whether we want installed packages or ebuilds
root: The root to use when querying packages.
@@ -382,7 +383,7 @@
Resolving means replacing PACKAGE_STABLE with the actual number.
Args:
- target: The target to operate on (e.g. i686-pc-linux-gnu)
+ target: The target to operate on (e.g. i686-cros-linux-gnu)
package: The target/package to operate on (e.g. gcc)
versions: List of versions to resolve
installed: Query installed packages
@@ -415,7 +416,7 @@
mean 'unstable' in most cases.
Args:
- target: The target to operate on (e.g. i686-pc-linux-gnu)
+ target: The target to operate on (e.g. i686-cros-linux-gnu)
package: The target/package to operate on (e.g. gcc)
Returns:
@@ -435,7 +436,7 @@
preferred, because all packages can be updated in a single pass.
Args:
- target: The target to operate on (e.g. i686-pc-linux-gnu)
+ target: The target to operate on (e.g. i686-cros-linux-gnu)
Returns:
True if |target| is completely initialized, else False
@@ -460,7 +461,7 @@
The pre-existing package.mask files can mess with the keywords.
Args:
- target: The target to operate on (e.g. i686-pc-linux-gnu)
+ target: The target to operate on (e.g. i686-cros-linux-gnu)
"""
maskfile = os.path.join('/etc/portage/package.mask', 'cross-' + target)
osutils.SafeUnlink(maskfile)