particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tools/osbuild-mpp: include nevra in package list

Browse source 
Include the nevra in the list of dep-solved packages. Use that for the
package info. Adapt the boot manifest accordingly.
This commit is contained in:
Christian Kellner 2021-06-30 22:09:00 +00:00
parent ff76b6fade
commit 8a27de0d10
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/data/manifests/fedora-boot.mpp.json
View file

@ -70,7 +70,7 @@
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"kernel_opts": "ro biosdevname=0 net.ifnames=0",
"legacy": "i386-pc",
"saved_entry": {"mpp-format-string": "ffffffffffffffffffffffffffffffff-{rpms['stages']['kernel-core'][12:-4]}" }
"saved_entry": {"mpp-format-string": "ffffffffffffffffffffffffffffffff-{rpms['stages']['kernel-core'][12:]}" }
}
},
{

3
tools/osbuild-mpp
View file

@ -282,6 +282,7 @@ class DepSolver:
pkg = {
"checksum": f"{checksum_type}:{checksum_hex}",
"name": tsi.pkg.name,
"nevra": str(tsi.pkg),
"url": url,
}
@ -372,7 +373,7 @@ class ManifestFile:
for dep in deps:
name, checksum, url = dep["name"], dep["checksum"], dep["url"]
pkginfos[name] = urllib.parse.urlparse(url).path.rsplit("/", 1)[1]
pkginfos[name] = dep["nevra"]
secretes = dep.get("secrets")
if secretes: