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

distro/rhel86: single osbuild import

Browse source 
osbuild2 was imported twice, once with its own name and once aliased as
plain osbuild.
Use only the plain osbuild alias.

Signed-off-by: Achilleas Koutsou <achilleas@koutsou.net>
This commit is contained in:
Achilleas Koutsou 2021-10-21 20:22:46 +02:00 • committed by Ondřej Budai
parent c8465e3161
commit c7cab92e88
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
internal/distro/rhel86/pipelines.go
View file

@ -11,7 +11,6 @@ import (
"github.com/osbuild/osbuild-composer/internal/common" "github.com/osbuild/osbuild-composer/internal/common"
"github.com/osbuild/osbuild-composer/internal/disk" "github.com/osbuild/osbuild-composer/internal/disk"
"github.com/osbuild/osbuild-composer/internal/distro" "github.com/osbuild/osbuild-composer/internal/distro"
"github.com/osbuild/osbuild-composer/internal/osbuild2"
osbuild "github.com/osbuild/osbuild-composer/internal/osbuild2" osbuild "github.com/osbuild/osbuild-composer/internal/osbuild2"
"github.com/osbuild/osbuild-composer/internal/rpmmd" "github.com/osbuild/osbuild-composer/internal/rpmmd"
) )
@ -882,7 +881,7 @@ func ostreeTreePipeline(repos []rpmmd.RepoConfig, packages []rpmmd.PackageSpec,
packages = append(packages, bpPackages...) packages = append(packages, bpPackages...)
if options.OSTree.Parent != "" && options.OSTree.URL != "" { if options.OSTree.Parent != "" && options.OSTree.URL != "" {
p.AddStage(osbuild2.NewOSTreePasswdStage("org.osbuild.source", options.OSTree.Parent)) p.AddStage(osbuild.NewOSTreePasswdStage("org.osbuild.source", options.OSTree.Parent))
} }
p.AddStage(osbuild.NewRPMStage(rpmStageOptions(repos), rpmStageInputs(packages))) p.AddStage(osbuild.NewRPMStage(rpmStageOptions(repos), rpmStageInputs(packages)))
@ -1262,7 +1261,7 @@ func ostreeDeployPipeline(
Ref: options.OSTree.Ref, Ref: options.OSTree.Ref,
}, },
} }
p.AddStage(osbuild2.NewFSTabStage(fstabOptions)) p.AddStage(osbuild.NewFSTabStage(fstabOptions))
// TODO: Add users? // TODO: Add users?
@ -1384,8 +1383,8 @@ func xzArchivePipeline(inputPipelineName, inputFilename, outputFilename string)
// mkfsStages generates a list of org.osbuild.mkfs.* stages based on a // mkfsStages generates a list of org.osbuild.mkfs.* stages based on a
// partition table description for a single device node // partition table description for a single device node
func mkfsStages(pt *disk.PartitionTable, device *osbuild.Device) []*osbuild2.Stage { func mkfsStages(pt *disk.PartitionTable, device *osbuild.Device) []*osbuild.Stage {
stages := make([]*osbuild2.Stage, 0, len(pt.Partitions)) stages := make([]*osbuild.Stage, 0, len(pt.Partitions))
// assume loopback device for simplicity since it's the only one currently supported // assume loopback device for simplicity since it's the only one currently supported
// panic if the conversion fails // panic if the conversion fails