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

Fix package sets for tar installer image type

Browse source
This commit is contained in:
Diaa Sami 2021-09-08 11:58:57 +02:00 • committed by Achilleas Koutsou
parent f87d8325d9
commit 20501f4e58
2 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
internal/distro/rhel90/distro.go
View file

@ -787,11 +787,8 @@ func newDistro(name, modulePlatformID, ostreeRef string) distro.Distro {
filename: "installer.iso", filename: "installer.iso",
mimeType: "application/x-iso9660-image", mimeType: "application/x-iso9660-image",
packageSets: map[string]rpmmd.PackageSet{ packageSets: map[string]rpmmd.PackageSet{
buildPkgsKey: x8664InstallerBuildPackageSet(), buildPkgsKey: x8664InstallerBuildPackageSet(),
osPkgsKey: { osPkgsKey: bareMetalPackageSet(),
Include: []string{"lvm2", "policycoreutils", "selinux-policy-targeted"},
Exclude: []string{"rng-tools"},
},
installerPkgsKey: installerPackageSet(), installerPkgsKey: installerPackageSet(),
}, },
rpmOstree: false, rpmOstree: false,

20
internal/distro/rhel90/package_sets.go
View file

@ -399,3 +399,23 @@ func edgeInstallerPackageSet() rpmmd.PackageSet {
Exclude: nil, Exclude: nil,
} }
} }
func bareMetalPackageSet() rpmmd.PackageSet {
return rpmmd.PackageSet{
Include: []string{
"authselect-compat", "chrony", "cockpit-system", "cockpit-ws",
"@core", "dhcp-client", "dnf", "dnf-utils", "dosfstools",
"insights-client", "iwl1000-firmware", "iwl100-firmware",
"iwl105-firmware", "iwl135-firmware", "iwl2000-firmware",
"iwl2030-firmware", "iwl3160-firmware", "iwl5000-firmware",
"iwl5150-firmware", "iwl6000g2a-firmware", "iwl6000g2b-firmware",
"iwl6050-firmware", "iwl7260-firmware", "lvm2", "net-tools",
"NetworkManager", "nfs-utils", "oddjob", "oddjob-mkhomedir",
"policycoreutils", "psmisc", "python3-jsonschema",
"qemu-guest-agent", "redhat-release", "redhat-release-eula",
"rsync", "selinux-policy-targeted", "subscription-manager-cockpit",
"tar", "tcpdump", "yum",
},
Exclude: nil,
}
}