Skip to content

Commit 1c40b49

Browse files
Fix CI for Linux kernel module scan plugin
Signed-off-by: OctavioValdiviaMendoza <octavio.valdiviamendoza@sjsu.edu>
1 parent 0de4be9 commit 1c40b49

5 files changed

Lines changed: 7 additions & 5 deletions

File tree

azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ jobs:
111111
# and we use the special --test-suite=plugins marker for these
112112
# tests
113113
additional_license_combined: |
114-
venv/bin/pip install tests/licensedcode/data/additional_licenses/additional_plugin_1/
115-
venv/bin/pip install tests/licensedcode/data/additional_licenses/additional_plugin_2/
114+
venv/bin/pip install --no-deps tests/licensedcode/data/additional_licenses/additional_plugin_1/
115+
venv/bin/pip install --no-deps tests/licensedcode/data/additional_licenses/additional_plugin_2/
116116
venv/bin/scancode-reindex-licenses \
117117
--additional-directory tests/licensedcode/data/additional_licenses/additional_dir/
118118
venv/bin/pytest -vvs --test-suite=plugins \

pyproject-scancode-toolkit-mini.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,7 @@ facet = "summarycode.facet:AddFacet"
265265
# module for details and doc.
266266
[project.entry-points.scancode_scan]
267267
info = "scancode.plugin_info:InfoScanner"
268+
lkm = "scancode.plugin_lkm:LinuxKernelModuleScanner"
268269
licenses = "licensedcode.plugin_license:LicenseScanner"
269270
copyrights = "cluecode.plugin_copyright:CopyrightScanner"
270271
packages = "packagedcode.plugin_package:PackageScanner"

src/scancode/plugin_lkm.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,8 @@ def extract_modinfo(location: str) -> Dict[str, List[str]]:
114114

115115
def get_dependency_names(metadata: Dict[str, List[str]]) -> List[str]:
116116
"""
117-
Returns a list of strings, each being a kernel module name
118-
Normalized fields to a list of strings derived from the '.modinfo' metadata. The 'depends' field is a
119-
comma-separated list of required kernel module names
117+
Return normalized kernel module dependency names from '.modinfo' metadata.
118+
The 'depends' field is a comma-separated list of required module names.
120119
"""
121120
dependency_names = []
122121

tests/scancode/data/help/help.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Options:
2323
other scans:
2424
-i, --info Scan <input> for file information (size, checksums, etc).
2525
--generated Classify automatically generated code files with a flag.
26+
--lkm Scan Linux kernel module files for .modinfo metadata.
2627
-e, --email Scan <input> for emails.
2728
-u, --url Scan <input> for urls.
2829

tests/scancode/data/help/help_linux.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Options:
2525
other scans:
2626
-i, --info Scan <input> for file information (size, checksums, etc).
2727
--generated Classify automatically generated code files with a flag.
28+
--lkm Scan Linux kernel module files for .modinfo metadata.
2829
-e, --email Scan <input> for emails.
2930
-u, --url Scan <input> for urls.
3031

0 commit comments

Comments
 (0)