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

distro/pipeline: take depsolved packages as argument

Browse source 
This is unused for now, but will allow us to generate pipelines with
the pre-depsolved NEVRAs, so osbuild does not need to depsolve again.

Signed-off-by: Tom Gundersen <teg@jklm.no>
This commit is contained in:
Tom Gundersen 2020-02-03 01:44:18 +01:00 • committed by msehnout
parent 59da8b066f
commit fefe5db4ce
11 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cmd/osbuild-pipeline/main.go
View file

@ -88,7 +88,7 @@ func main() {
packages = append(pkgs, packages...)
rpmmd := rpmmd.NewRPMMD()
_, checksums, err := rpmmd.Depsolve(packages, exclude_pkgs, d.Repositories(archArg), d.ModulePlatformID(), false)
packageSpecs, checksums, err := rpmmd.Depsolve(packages, exclude_pkgs, d.Repositories(archArg), d.ModulePlatformID(), false)
if err != nil {
panic("Could not depsolve: " + err.Error())
}
@ -97,12 +97,12 @@ func main() {
if err != nil {
panic("Could not get build packages: " + err.Error())
}
_, _, err = rpmmd.Depsolve(buildPkgs, nil, d.Repositories(archArg), d.ModulePlatformID(), false)
buildPackageSpecs, _, err := rpmmd.Depsolve(buildPkgs, nil, d.Repositories(archArg), d.ModulePlatformID(), false)
if err != nil {
panic("Could not depsolve build packages: " + err.Error())
}
pipeline, err := d.Pipeline(blueprint, nil, checksums, archArg, imageType, 0)
pipeline, err := d.Pipeline(blueprint, nil, packageSpecs, buildPackageSpecs, checksums, archArg, imageType, 0)
if err != nil {
panic(err.Error())
}