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

distro/*: remove kernel from image types

Browse source 
The kernel now comes from the blueprint packages even when it's not
specified.  Removing from the base packages of the image types avoids
duplication and allows for alternative kernels to be specified without
also including the default.

The latter is necessary for RHEL for Edge and Fedora IoT images (ostree
commits) that fail to build when multiple kernels are installed.

ImageType tests modified to fix expected package order.
This commit is contained in:
Achilleas Koutsou 2021-02-01 14:52:55 +01:00 • committed by Tom Gundersen
parent d0923af70d
commit 8d9753a4c2
8 changed files with 24 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -540,7 +540,6 @@ func New() distro.Distro {
"fedora-release-iot",
"glibc", "glibc-minimal-langpack", "nss-altfiles",
"sssd-client", "libsss_sudo", "shadow-utils",
"kernel",
"dracut-config-generic", "dracut-network",
"rpm-ostree", "polkit", "lvm2",
"chrony", "zram",
@ -598,7 +597,6 @@ func New() distro.Distro {
packages: []string{
"@Core",
"chrony",
"kernel",
"selinux-policy-targeted",
"langpacks-en",
"libxcrypt-compat",
@ -662,7 +660,6 @@ func New() distro.Distro {
packages: []string{
"@Core",
"chrony",
"kernel",
"selinux-policy-targeted",
"spice-vdagent",
"qemu-guest-agent",
@ -695,7 +692,6 @@ func New() distro.Distro {
packages: []string{
"@Core",
"chrony",
"kernel",
"selinux-policy-targeted",
"langpacks-en",
"net-tools",
@ -733,7 +729,6 @@ func New() distro.Distro {
"@core",
"chrony",
"firewalld",
"kernel",
"langpacks-en",
"open-vm-tools",
"selinux-policy-targeted",

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

@ -227,7 +227,6 @@ func TestImageType_BasePackages(t *testing.T) {
basePackages: []string{
"@Core",
"chrony",
"kernel",
"selinux-policy-targeted",
"langpacks-en",
"libxcrypt-compat",
@ -235,6 +234,9 @@ func TestImageType_BasePackages(t *testing.T) {
"cloud-init",
"checkpolicy",
"net-tools",
// Default from Blueprint
"kernel",
},
bootloaderPackages: []string{
"dracut-config-generic",
@ -250,7 +252,6 @@ func TestImageType_BasePackages(t *testing.T) {
basePackages: []string{
"@Core",
"chrony",
"kernel",
"selinux-policy-targeted",
"spice-vdagent",
"qemu-guest-agent",
@ -258,6 +259,9 @@ func TestImageType_BasePackages(t *testing.T) {
"langpacks-en",
"cloud-init",
"libdrm",
// Default from Blueprint
"kernel",
},
bootloaderPackages: []string{
"dracut-config-generic",

6
internal/distro/fedora33/distro.go
View file

@ -552,7 +552,6 @@ func New() distro.Distro {
"fedora-release-iot",
"glibc", "glibc-minimal-langpack", "nss-altfiles",
"sssd-client", "libsss_sudo", "shadow-utils",
"kernel",
"dracut-config-generic", "dracut-network",
"rpm-ostree", "polkit", "lvm2",
"cryptsetup", "pinentry",
@ -614,7 +613,6 @@ func New() distro.Distro {
packages: []string{
"@Core",
"chrony",
"kernel",
"selinux-policy-targeted",
"langpacks-en",
"libxcrypt-compat",
@ -645,7 +643,6 @@ func New() distro.Distro {
filename: "disk.qcow2",
mimeType: "application/x-qemu-disk",
packages: []string{
"kernel-core",
"@Fedora Cloud Server",
"chrony",
"systemd-udev",
@ -682,7 +679,6 @@ func New() distro.Distro {
packages: []string{
"@Core",
"chrony",
"kernel",
"selinux-policy-targeted",
"spice-vdagent",
"qemu-guest-agent",
@ -717,7 +713,6 @@ func New() distro.Distro {
packages: []string{
"@Core",
"chrony",
"kernel",
"selinux-policy-targeted",
"langpacks-en",
"net-tools",
@ -755,7 +750,6 @@ func New() distro.Distro {
filename: "disk.vmdk",
mimeType: "application/x-vmdk",
packages: []string{
"kernel-core",
"@Fedora Cloud Server",
"chrony",
"systemd-udev",

8
internal/distro/fedora33/distro_test.go
View file

@ -227,7 +227,6 @@ func TestImageType_BasePackages(t *testing.T) {
basePackages: []string{
"@Core",
"chrony",
"kernel",
"selinux-policy-targeted",
"langpacks-en",
"libxcrypt-compat",
@ -235,6 +234,9 @@ func TestImageType_BasePackages(t *testing.T) {
"cloud-init",
"checkpolicy",
"net-tools",
// Default from Blueprint
"kernel",
},
bootloaderPackages: []string{
"dracut-config-generic",
@ -253,7 +255,6 @@ func TestImageType_BasePackages(t *testing.T) {
basePackages: []string{
"@Core",
"chrony",
"kernel",
"selinux-policy-targeted",
"spice-vdagent",
"qemu-guest-agent",
@ -261,6 +262,9 @@ func TestImageType_BasePackages(t *testing.T) {
"langpacks-en",
"cloud-init",
"libdrm",
// Default from Blueprint
"kernel",
},
bootloaderPackages: []string{
"dracut-config-generic",

8
internal/distro/rhel8/distro.go
View file

@ -169,7 +169,6 @@ func (t *imageType) Packages(bp blueprint.Blueprint) ([]string, []string) {
if t.bootable {
packages = append(packages, t.arch.bootloaderPackages...)
}
return packages, t.excludedPackages
}
@ -638,7 +637,6 @@ func New() distro.Distro {
packages: []string{
"redhat-release", // TODO: is this correct for Edge?
"glibc", "glibc-minimal-langpack", "nss-altfiles",
"kernel",
"dracut-config-generic", "dracut-network",
"basesystem", "bash", "platform-python",
"shadow-utils", "chrony", "setup", "shadow-utils",
@ -694,7 +692,6 @@ func New() distro.Distro {
packages: []string{
"redhat-release", // TODO: is this correct for Edge?
"glibc", "glibc-minimal-langpack", "nss-altfiles",
"kernel",
"dracut-config-generic", "dracut-network",
"basesystem", "bash", "platform-python",
"shadow-utils", "chrony", "setup", "shadow-utils",
@ -755,7 +752,6 @@ func New() distro.Distro {
"dhcp-client",
"gdisk",
"insights-client",
"kernel",
"langpacks-en",
"net-tools",
"NetworkManager",
@ -826,7 +822,6 @@ func New() distro.Distro {
"@core",
"chrony",
"dnf",
"kernel",
"yum",
"nfs-utils",
"dnf-utils",
@ -912,7 +907,6 @@ func New() distro.Distro {
"langpacks-en",
// From the lorax kickstart
"kernel",
"selinux-policy-targeted",
"cloud-init",
"qemu-guest-agent",
@ -954,7 +948,6 @@ func New() distro.Distro {
"langpacks-en",
// From the lorax kickstart
"kernel",
"selinux-policy-targeted",
"chrony",
"WALinuxAgent",
@ -992,7 +985,6 @@ func New() distro.Distro {
"@core",
"chrony",
"firewalld",
"kernel",
"langpacks-en",
"open-vm-tools",
"selinux-policy-targeted",

8
internal/distro/rhel8/distro_test.go
View file

@ -247,7 +247,6 @@ func TestImageType_BasePackages(t *testing.T) {
"dhcp-client",
"gdisk",
"insights-client",
"kernel",
"langpacks-en",
"net-tools",
"NetworkManager",
@ -258,6 +257,9 @@ func TestImageType_BasePackages(t *testing.T) {
"selinux-policy-targeted",
"tar",
"yum-utils",
// Default from Blueprint
"kernel",
},
bootloaderPackages: []string{
"dracut-config-generic",
@ -312,11 +314,13 @@ func TestImageType_BasePackages(t *testing.T) {
"langpacks-en",
// From the lorax kickstart
"kernel",
"selinux-policy-targeted",
"cloud-init",
"qemu-guest-agent",
"spice-vdagent",
// Default from Blueprint
"kernel",
},
bootloaderPackages: []string{
"dracut-config-generic",

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

@ -780,7 +780,6 @@ func newDistro(isCentos bool) distro.Distro {
packages: []string{
"redhat-release", // TODO: is this correct for Edge?
"glibc", "glibc-minimal-langpack", "nss-altfiles",
"kernel",
"dracut-config-generic", "dracut-network",
"basesystem", "bash", "platform-python",
"shadow-utils", "chrony", "setup", "shadow-utils",
@ -837,7 +836,6 @@ func newDistro(isCentos bool) distro.Distro {
packages: []string{
"redhat-release", // TODO: is this correct for Edge?
"glibc", "glibc-minimal-langpack", "nss-altfiles",
"kernel",
"dracut-config-generic", "dracut-network",
"basesystem", "bash", "platform-python",
"shadow-utils", "chrony", "setup", "shadow-utils",
@ -899,7 +897,6 @@ func newDistro(isCentos bool) distro.Distro {
"dhcp-client",
"gdisk",
"insights-client",
"kernel",
"langpacks-en",
"net-tools",
"NetworkManager",
@ -981,7 +978,6 @@ func newDistro(isCentos bool) distro.Distro {
"dosfstools",
"dracut-norescue",
"insights-client",
"kernel",
"NetworkManager",
"nfs-utils",
"oddjob",
@ -1058,7 +1054,6 @@ func newDistro(isCentos bool) distro.Distro {
"langpacks-en",
// From the lorax kickstart
"kernel",
"selinux-policy-targeted",
"cloud-init",
"qemu-guest-agent",
@ -1105,7 +1100,6 @@ func newDistro(isCentos bool) distro.Distro {
"langpacks-en",
// From the lorax kickstart
"kernel",
"selinux-policy-targeted",
"chrony",
"WALinuxAgent",
@ -1145,7 +1139,6 @@ func newDistro(isCentos bool) distro.Distro {
"@core",
"chrony",
"firewalld",
"kernel",
"langpacks-en",
"open-vm-tools",
"selinux-policy-targeted",

8
internal/distro/rhel84/distro_test.go
View file

@ -292,7 +292,6 @@ func TestImageType_BasePackages(t *testing.T) {
"@core",
"dhcp-client",
"gdisk",
"kernel",
"langpacks-en",
"net-tools",
"NetworkManager",
@ -302,6 +301,9 @@ func TestImageType_BasePackages(t *testing.T) {
"selinux-policy-targeted",
"tar",
"yum-utils",
// Default from Blueprint
"kernel",
},
bootloaderPackages: []string{
"dracut-config-generic",
@ -361,11 +363,13 @@ func TestImageType_BasePackages(t *testing.T) {
"@Core",
"langpacks-en",
// From the lorax kickstart
"kernel",
"selinux-policy-targeted",
"cloud-init",
"qemu-guest-agent",
"spice-vdagent",
// Default from Blueprint
"kernel",
},
bootloaderPackages: []string{
"dracut-config-generic",