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

distro/f32: add SELinux RPM to build pipeline

Browse source 
This patch adds SELinux stage to build pipeline for f32 just like
we do for RHEL8. This helps with issues like this:
https://github.com/osbuild/osbuild-composer/issues/798
This commit is contained in:
Martin Sehnoutka 2020-06-26 09:54:54 +02:00 • committed by Tom Gundersen
parent 12172adf47
commit 636b761b6b
12 changed files with 561 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/distro/fedora32/distro.go
View file

@ -298,6 +298,7 @@ func (t *imageType) pipeline(c *blueprint.Customizations, options distro.ImageOp
func (t *imageType) buildPipeline(repos []rpmmd.RepoConfig, arch architecture, buildPackageSpecs []rpmmd.PackageSpec) *osbuild.Pipeline {
p := &osbuild.Pipeline{}
p.AddStage(osbuild.NewRPMStage(t.rpmStageOptions(arch, repos, buildPackageSpecs)))
p.AddStage(osbuild.NewSELinuxStage(t.selinuxStageOptions()))
return p
}
@ -742,6 +743,7 @@ func New() distro.Distro {
"e2fsprogs",
"policycoreutils",
"qemu-img",
"selinux-policy-targeted",
"systemd",
"tar",
"xz",

2
internal/distro/fedora32/distro_test.go
View file

@ -87,6 +87,7 @@ func TestImageType_BuildPackages(t *testing.T) {
"grub2-pc",
"policycoreutils",
"qemu-img",
"selinux-policy-targeted",
"systemd",
"tar",
"xz",
@ -97,6 +98,7 @@ func TestImageType_BuildPackages(t *testing.T) {
"e2fsprogs",
"policycoreutils",
"qemu-img",
"selinux-policy-targeted",
"systemd",
"tar",
"xz",