Skip to content

Commit eec8761

Browse files
committed
Add pkg_supplier collection method for tdnf
This commit adds `pkg_supplier` metadata collection scripts to base.yml so it can later be used to declare a namespace field for photon package purls. It also makes a few tweaks to the `pkg_supplier` script for `apk` and `pip` based package managers. Works towards #1206 Signed-off-by: Rose Judge <[email protected]>
1 parent 3624b30 commit eec8761

File tree

1 file changed

+13
-3
lines changed
  • tern/analyze/default/command_lib

1 file changed

+13
-3
lines changed

tern/analyze/default/command_lib/base.yml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,15 @@ tdnf:
5959
- 'tdnf check-update > /dev/null'
6060
- 'tdnf list installed | cut -f2 -d"." | cut -f1 -d" "'
6161
delimiter: "\n"
62+
pkg_suppliers:
63+
invoke:
64+
1:
65+
container:
66+
- 'tdnf check-update > /dev/null'
67+
- "distro=`/bin/cat /etc/os-release | grep NAME | sed -n '1p' | cut -f 2 -d '=' | cut -d '\"' -f2`"
68+
- 'pkgs=`tdnf list installed | cut -f1 -d"."`'
69+
- "for p in $pkgs; do echo $distro; done"
70+
delimiter: "\n"
6271
files: {}
6372
proj_urls:
6473
invoke:
@@ -180,8 +189,9 @@ apk:
180189
invoke:
181190
1:
182191
container:
192+
- "distro=`/bin/cat /etc/os-release | grep NAME | sed -n '1p' | cut -f 2 -d '=' | cut -d '\"' -f2`"
183193
- "pkgs=`apk info 2>/dev/null`"
184-
- "for p in $pkgs; do echo 'Alpine Linux'; done"
194+
- "for p in $pkgs; do echo $distro; done"
185195
delimiter: "\n"
186196
licenses:
187197
invoke:
@@ -363,7 +373,7 @@ pip:
363373
1:
364374
container:
365375
- "pkgs=`pip list --format=freeze 2> /dev/null | cut -f1 -d'='`"
366-
- "for p in $pkgs; do echo 'PyPI'; done"
376+
- "for p in $pkgs; do echo 'Python Package Index'; done"
367377
delimiter: "\n"
368378
licenses:
369379
invoke:
@@ -413,7 +423,7 @@ pip3:
413423
1:
414424
container:
415425
- "pkgs=`pip3 list --format=freeze 2> /dev/null | cut -f1 -d'='`"
416-
- "for p in $pkgs; do echo 'PyPI'; done"
426+
- "for p in $pkgs; do echo 'Python Package Index'; done"
417427
delimiter: "\n"
418428
licenses:
419429
invoke:

0 commit comments

Comments
 (0)