Revert "cros_extract_deps: Begin moving functions."
This reverts commit 5e621a062888896735905356b36720ddd562cbf3.
Reason for revert: Suspected cause of chromium:1151385
Original change's description:
> cros_extract_deps: Begin moving functions.
>
> BUG=chromium:1135361
> TEST=./run_pytest
>
> Change-Id: I1430fca1dd9da971970734006941d7f5da91bd04
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2459506
> Tested-by: Alex Klein <saklein@chromium.org>
> Reviewed-by: Mike Frysinger <vapier@chromium.org>
> Commit-Queue: Alex Klein <saklein@chromium.org>
BUG=chromium:1135361, chromium:1151385
TEST=None
Change-Id: I0c5b4b4c208ff690495a3e0d45526d2882002250
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2552763
Reviewed-by: Alex Klein <saklein@chromium.org>
Commit-Queue: Alex Klein <saklein@chromium.org>
Tested-by: Alex Klein <saklein@chromium.org>
diff --git a/lib/sysroot_lib.py b/lib/sysroot_lib.py
index bc16b11..daefc4f 100644
--- a/lib/sysroot_lib.py
+++ b/lib/sysroot_lib.py
@@ -11,7 +11,6 @@
import multiprocessing
import os
import sys
-from typing import List
from chromite.api.gen.chromiumos import common_pb2
from chromite.lib import constants
@@ -21,7 +20,6 @@
from chromite.lib import osutils
from chromite.lib import portage_util
from chromite.lib import toolchain
-from chromite.lib.parser import package_info
assert sys.version_info >= (3, 6), 'This module requires Python 3.6+'
@@ -803,30 +801,3 @@
os._exit(result.returncode)
else:
cros_build_lib.sudo_run(rm + [self.path], quiet=True)
-
- def get_sdk_provided_packages(self) -> List[package_info.PackageInfo]:
- """Find all packages provided by the SDK (i.e. package.provided)."""
- # Look at packages in package.provided.
- sdk_file_path = self._Path('etc', 'portage', 'profile', 'package.provided')
- for line in osutils.ReadFile(sdk_file_path).splitlines():
- # Skip comments and empty lines.
- line = line.split('#', 1)[0].strip()
- if not line:
- continue
- yield package_info.parse(line)
-
-
-def get_sdk_provided_packages(sysroot_path: str):
- """Find all packages provided by the SDK (i.e. package.provided).
-
- Convenience wrapper for the Sysroot method.
-
- Args:
- sysroot_path: The sysroot to use when finding SDK packages.
-
- Returns:
- A list of CPV Name strings, e.g.
- ["sys-libs/glibc-2.23-r9", "dev-lang/go-1.8.3-r1"]
- """
- sysroot = Sysroot(sysroot_path)
- return sysroot.get_sdk_provided_packages()
diff --git a/lib/sysroot_lib_unittest.py b/lib/sysroot_lib_unittest.py
index 277e98e..052eca7 100644
--- a/lib/sysroot_lib_unittest.py
+++ b/lib/sysroot_lib_unittest.py
@@ -271,17 +271,3 @@
with self.assertRaises(sysroot_lib.ToolchainInstallError):
self.sysroot.UpdateToolchain('board', local_init=True)
-
-
-def test_get_sdk_provided_packages(simple_sysroot):
- pkg_provided = simple_sysroot.path / 'etc/portage/profile/package.provided'
- content = """
-foo/bar-2-r3
-
-# Comment line.
-cat/pkg-1.0.0 # Comment after package.
-"""
- osutils.WriteFile(pkg_provided, content, makedirs=True)
- pkgs = list(sysroot_lib.get_sdk_provided_packages(simple_sysroot.path))
- expected = [package_info.parse(p) for p in ('foo/bar-2-r3', 'cat/pkg-1.0.0')]
- assert pkgs == expected
diff --git a/scripts/cros_extract_deps.py b/scripts/cros_extract_deps.py
index 3bccf52..1ef8e07 100644
--- a/scripts/cros_extract_deps.py
+++ b/scripts/cros_extract_deps.py
@@ -11,6 +11,7 @@
from __future__ import print_function
from __future__ import absolute_import
+import os
import sys
from chromite.lib.depgraph import DepGraphGenerator
@@ -18,8 +19,8 @@
from chromite.lib import commandline
from chromite.lib import cros_build_lib
from chromite.lib import cros_logging as logging
+from chromite.lib import osutils
from chromite.lib import pformat
-from chromite.lib import sysroot_lib
from chromite.lib.parser import package_info
@@ -153,6 +154,27 @@
return cpes
+def GenerateSDKCPVList(sysroot):
+ """Find all SDK packages from package.provided
+
+ Args:
+ sysroot: The board directory to use when finding SDK packages.
+
+ Returns:
+ A list of CPV Name strings, e.g.
+ ["sys-libs/glibc-2.23-r9", "dev-lang/go-1.8.3-r1"]
+ """
+ # Look at packages in package.provided.
+ sdk_file_path = os.path.join(sysroot, 'etc', 'portage',
+ 'profile', 'package.provided')
+ for line in osutils.ReadFile(sdk_file_path).splitlines():
+ # Skip comments and empty lines.
+ line = line.split('#', 1)[0].strip()
+ if not line:
+ continue
+ yield line
+
+
def GenerateCPEList(deps_list, sysroot):
"""Generate all CPEs for the packages included in deps_list and SDK packages
@@ -181,19 +203,20 @@
"""
cpe_dump = []
- # Generate CPEs for SDK packages.
- for pkg_info in sorted(sysroot_lib.get_sdk_provided_packages(sysroot)):
+ # Generage CPEs for SDK packages.
+ for sdk_cpv in sorted(GenerateSDKCPVList(sysroot)):
# Only add CPE for SDK CPVs missing in deps_list.
- if deps_list.get(pkg_info.cpvr) is not None:
+ if deps_list.get(sdk_cpv) is not None:
continue
- cpes = GetCPEFromCPV(pkg_info.category, pkg_info.package, pkg_info.version)
+ split = package_info.SplitCPV(sdk_cpv)
+ cpes = GetCPEFromCPV(split.category, split.package, split.version_no_rev)
if cpes:
- cpe_dump.append({'ComponentName': '%s' % pkg_info.atom,
+ cpe_dump.append({'ComponentName': '%s' % split.cp,
'Repository': 'cros',
'Targets': sorted(cpes)})
else:
- logging.warning('No CPE entry for %s', pkg_info.cpvr)
+ logging.warning('No CPE entry for %s', sdk_cpv)
# Generage CPEs for packages in deps_list.
for cpv, record in sorted(deps_list.items()):
diff --git a/test/portage_fixtures.py b/test/portage_fixtures.py
index a329c7d..f6a45cb 100644
--- a/test/portage_fixtures.py
+++ b/test/portage_fixtures.py
@@ -43,13 +43,3 @@
yield overlays[i]
return make_overlay_stack
-
-
-# pylint: disable=redefined-outer-name
-@pytest.fixture
-def simple_sysroot(overlay_stack, tmp_path):
- """Create the simplest possible sysroot."""
- # pylint: disable=redefined-outer-name
- overlay, = overlay_stack(1)
- profile = overlay.create_profile()
- return cr.test.Sysroot(tmp_path, profile, [overlay])
