blueprint: move tar towards lorax parity

The main difference (according to `rpm -qa`) is an additional package
containing a gpg key which was used to verify packages. The one
generated by lorax-composer doesn't have this, because it doesn't verify
signatures.
This commit is contained in:
Lars Karlitski 2019-10-29 03:31:48 +01:00 committed by Tom Gundersen
parent d4e1ecea7e
commit cde1325bc3
5 changed files with 40 additions and 18 deletions

View file

@ -154,7 +154,7 @@ func TestFilenameFromType(t *testing.T) {
{
name: "tar",
args: args{"tar"},
want: "image.tar",
want: "root.tar.xz",
want1: "application/x-tar",
},
{

View file

@ -170,7 +170,7 @@ func addF30QemuAssembler(p *pipeline.Pipeline, format string, filename string) {
})
}
func addF30TarAssembler(p *pipeline.Pipeline, filename string) {
func addF30TarAssembler(p *pipeline.Pipeline, filename, compression string) {
p.Assembler = pipeline.NewTarAssembler(
&pipeline.TarAssemblerOptions{
Filename: filename,

View file

@ -5,14 +5,28 @@ import "github.com/osbuild/osbuild-composer/internal/pipeline"
type tarOutput struct{}
func (t *tarOutput) translate(b *Blueprint) *pipeline.Pipeline {
p := getF30Pipeline()
packages := [...]string{
"policycoreutils",
"selinux-policy-targeted",
"kernel",
"firewalld",
"chrony",
"langpacks-en",
}
excludedPackages := [...]string{
"dracut-config-rescue",
}
p := getCustomF30PackageSet(packages[:], excludedPackages[:])
addF30LocaleStage(p)
addF30GRUB2Stage(p, b.getKernelCustomization())
addF30FixBlsStage(p)
addF30SELinuxStage(p)
addF30TarAssembler(p, t.getName())
addF30TarAssembler(p, t.getName(), "xz")
return p
}
func (t *tarOutput) getName() string {
return "image.tar"
return "root.tar.xz"
}
func (t *tarOutput) getMime() string {