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

cmd: remove usage of ImageType.PackageSets()

Browse source 
Use the new manifest generation procedure in the cmd line tools.  The
new procedure doesn't rely on ImageType.PackageSets() to compute the
packages for the depsolving.  Instead, it calls Manifest() and depsolves
the packages attached to the returned object
(manifest.Content.PackageSets).
This commit is contained in:
Achilleas Koutsou 2023-05-09 20:35:27 +02:00 • committed by Simon de Vlieger
parent d5c4a0c31f
commit b495d9d476
5 changed files with 55 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

16
cmd/gen-manifests/main.go
View file

@ -161,7 +161,13 @@ func makeManifestJob(name string, imgType distro.ImageType, cr composeRequest, d
return fmt.Errorf("[%s] container resolution failed: %s", filename, err.Error())
}
packageSpecs, err := depsolve(cacheDir, imgType, bp, options, repos, distribution, archName)
manifest, _, err := imgType.Manifest(&bp, options, repos, nil, containerSpecs, seedArg)
if err != nil {
err = fmt.Errorf("[%s] failed: %s", filename, err)
return
}
packageSpecs, err := depsolve(cacheDir, manifest.Content.PackageSets, distribution, archName)
if err != nil {
err = fmt.Errorf("[%s] depsolve failed: %s", filename, err.Error())
return
@ -174,11 +180,6 @@ func makeManifestJob(name string, imgType distro.ImageType, cr composeRequest, d
if cr.Blueprint != nil {
bp = blueprint.Blueprint(*cr.Blueprint)
}
manifest, _, err := imgType.Manifest(&bp, options, repos, packageSpecs, containerSpecs, seedArg)
if err != nil {
err = fmt.Errorf("[%s] failed: %s", filename, err)
return
}
mf, err := manifest.Serialize(packageSpecs)
request := composeRequest{
@ -262,10 +263,9 @@ func resolveContainers(containers []blueprint.Container, archName string) ([]con
return resolver.Finish()
}
func depsolve(cacheDir string, imageType distro.ImageType, bp blueprint.Blueprint, options distro.ImageOptions, repos []rpmmd.RepoConfig, d distro.Distro, arch string) (map[string][]rpmmd.PackageSpec, error) {
func depsolve(cacheDir string, packageSets map[string][]rpmmd.PackageSet, d distro.Distro, arch string) (map[string][]rpmmd.PackageSpec, error) {
solver := dnfjson.NewSolver(d.ModulePlatformID(), d.Releasever(), arch, d.Name(), cacheDir)
solver.SetDNFJSONPath("./dnf-json")
packageSets := imageType.PackageSets(bp, options, repos)
depsolvedSets := make(map[string][]rpmmd.PackageSpec)
for name, pkgSet := range packageSets {
res, err := solver.Depsolve(pkgSet)