diff --git a/.gitignore b/.gitignore index 8bd310e..9caf0d7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osbuild-composer-118.2.tar.gz +SOURCES/osbuild-composer-132.2.tar.gz diff --git a/.osbuild-composer.metadata b/.osbuild-composer.metadata index 27a1dc0..c458fe8 100644 --- a/.osbuild-composer.metadata +++ b/.osbuild-composer.metadata @@ -1 +1 @@ -e32e37dd58dbfdd77467c6318759e5905ec80a84 SOURCES/osbuild-composer-118.2.tar.gz +7d3fc3e6143f79531868e9d96f27b4afbd61950b SOURCES/osbuild-composer-132.2.tar.gz diff --git a/SOURCES/1001-Add-repositories-for-OL-8.10-and-OL-9.6.patch b/SOURCES/1001-Add-repositories-for-OL-8.10-and-OL-9.6.patch new file mode 100644 index 0000000..726f440 --- /dev/null +++ b/SOURCES/1001-Add-repositories-for-OL-8.10-and-OL-9.6.patch @@ -0,0 +1,118 @@ +From f929fc9f80b6fe8c1d73471b9514239aa4efa9ee Mon Sep 17 00:00:00 2001 +From: Josue David Hernandez Gutierrez +Date: Wed, 30 Oct 2024 17:08:55 +0000 +Subject: [PATCH 1/8] Add repositories for OL-8.10 and OL-9.5 + +Signed-off-by: Josue David Hernandez Gutierrez +--- + repositories/ol-810.json | 42 +++++++++++++++++++++++++++++++++++ + repositories/ol-95.json | 48 ++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 90 insertions(+) + create mode 100644 repositories/ol-810.json + create mode 100644 repositories/ol-95.json + +diff --git a/repositories/ol-810.json b/repositories/ol-810.json +new file mode 100644 +index 0000000..a23b3c6 +--- /dev/null ++++ b/repositories/ol-810.json +@@ -0,0 +1,42 @@ ++{ ++ "aarch64": [ ++ { ++ "name": "baseos", ++ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/baseos/latest/aarch64", ++ "check_gpg": false, ++ "rhsm": false ++ }, ++ { ++ "name": "uekr7", ++ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/UEKR7/aarch64/", ++ "check_gpg": false, ++ "rhsm": false ++ }, ++ { ++ "name": "appstream", ++ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/appstream/aarch64", ++ "check_gpg": false, ++ "rhsm": false ++ } ++ ], ++ "x86_64": [ ++ { ++ "name": "baseos", ++ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/baseos/latest/x86_64", ++ "check_gpg": false, ++ "rhsm": false ++ }, ++ { ++ "name": "uekr7", ++ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/UEKR7/x86_64/", ++ "check_gpg": false, ++ "rhsm": false ++ }, ++ { ++ "name": "appstream", ++ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/appstream/x86_64", ++ "check_gpg": false, ++ "rhsm": false ++ } ++ ] ++} +diff --git a/repositories/ol-95.json b/repositories/ol-95.json +new file mode 100644 +index 0000000..08b877e +--- /dev/null ++++ b/repositories/ol-95.json +@@ -0,0 +1,48 @@ ++{ ++ "aarch64": [ ++ { ++ "name": "baseos", ++ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/aarch64", ++ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", ++ "check_gpg": true, ++ "rhsm": false ++ }, ++ { ++ "name": "uekr8", ++ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/UEKR8/aarch64/", ++ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", ++ "check_gpg": true, ++ "rhsm": false ++ }, ++ { ++ "name": "appstream", ++ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/appstream/aarch64", ++ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", ++ "check_gpg": true, ++ "rhsm": false ++ } ++ ], ++ "x86_64": [ ++ { ++ "name": "baseos", ++ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/x86_64", ++ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", ++ "check_gpg": true, ++ "rhsm": false ++ }, ++ { ++ "name": "uekr8", ++ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/UEKR8/x86_64/", ++ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", ++ "check_gpg": true, ++ "rhsm": false ++ }, ++ { ++ "name": "appstream", ++ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/appstream/x86_64", ++ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", ++ "check_gpg": true, ++ "rhsm": false ++ } ++ ] ++} +-- +2.43.5 + diff --git a/SOURCES/1002-Add-support-for-OL-on-osbuild-composer.patch b/SOURCES/1002-Add-support-for-OL-on-osbuild-composer.patch new file mode 100644 index 0000000..a5ce1b4 --- /dev/null +++ b/SOURCES/1002-Add-support-for-OL-on-osbuild-composer.patch @@ -0,0 +1,330 @@ +From 2d22821674b6785c1867757d2906282473a14634 Mon Sep 17 00:00:00 2001 +From: Josue David Hernandez Gutierrez +Date: Wed, 30 Oct 2024 18:39:41 +0000 +Subject: [PATCH 2/8] Add support for OL on osbuild-composer + +Signed-off-by: Josue David Hernandez Gutierrez +--- + .../osbuild/images/pkg/blueprint/customizations.go | 2 +- + .../osbuild/images/pkg/distro/rhel/distribution.go | 11 +++++++++++ + .../osbuild/images/pkg/distro/rhel/rhel8/ami.go | 2 +- + .../osbuild/images/pkg/distro/rhel/rhel8/azure.go | 8 ++++---- + .../images/pkg/distro/rhel/rhel8/bare_metal.go | 2 +- + .../osbuild/images/pkg/distro/rhel/rhel8/distro.go | 12 ++++++++---- + .../osbuild/images/pkg/distro/rhel/rhel9/ami.go | 2 +- + .../osbuild/images/pkg/distro/rhel/rhel9/azure.go | 8 ++++---- + .../images/pkg/distro/rhel/rhel9/bare_metal.go | 4 ++-- + .../osbuild/images/pkg/distro/rhel/rhel9/distro.go | 12 ++++++++---- + .../images/pkg/image/anaconda_live_installer.go | 2 +- + .../images/pkg/image/anaconda_ostree_installer.go | 2 +- + .../images/pkg/image/anaconda_tar_installer.go | 2 +- + .../images/pkg/image/ostree_simplified_installer.go | 2 +- + 14 files changed, 45 insertions(+), 26 deletions(-) + +diff --git a/vendor/github.com/osbuild/images/pkg/blueprint/customizations.go b/vendor/github.com/osbuild/images/pkg/blueprint/customizations.go +index 23addb9..81f248b 100644 +--- a/vendor/github.com/osbuild/images/pkg/blueprint/customizations.go ++++ b/vendor/github.com/osbuild/images/pkg/blueprint/customizations.go +@@ -277,7 +277,7 @@ func (c *Customizations) GetKernel() *KernelCustomization { + } + + if name == "" { +- name = "kernel" ++ name = "kernel-uek" + } + + return &KernelCustomization{ +diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/distribution.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/distribution.go +index 849ca43..4e55c18 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/distribution.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/distribution.go +@@ -138,6 +138,17 @@ func NewDistribution(name string, major, minor int) (*Distribution, error) { + ostreeRefTmpl: fmt.Sprintf("centos/%d/%%s/edge", major), + runner: &runner.CentOS{Version: uint64(major)}, + } ++ case "ol": ++ rd = &Distribution{ ++ name: fmt.Sprintf("ol-%d.%d", major, minor), ++ product: "Oracle Linux", ++ osVersion: fmt.Sprintf("%d.%d", major, minor), ++ releaseVersion: fmt.Sprintf("%d", major), ++ modulePlatformID: fmt.Sprintf("platform:el%d", major), ++ vendor: "redhat", ++ ostreeRefTmpl: fmt.Sprintf("ol/%d/%%s/edge", major), ++ runner: &runner.RHEL{Major: uint64(major), Minor: uint64(minor)}, ++ } + default: + return nil, fmt.Errorf("unknown distro name: %s", name) + } +diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/ami.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/ami.go +index 12f8043..4eba290 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/ami.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/ami.go +@@ -196,7 +196,7 @@ func baseEc2ImageConfig() *distro.ImageConfig { + { + Kernel: &osbuild.SysconfigKernelOptions{ + UpdateDefault: true, +- DefaultKernel: "kernel", ++ DefaultKernel: "kernel-uek", + }, + Network: &osbuild.SysconfigNetworkOptions{ + Networking: true, +diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/azure.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/azure.go +index 5441ac6..5e5f30c 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/azure.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/azure.go +@@ -154,9 +154,9 @@ func azureCommonPackageSet(t *rhel.ImageType) rpmmd.PackageSet { + "efibootmgr", + "gdisk", + "hyperv-daemons", +- "kernel", +- "kernel-core", +- "kernel-modules", ++ "kernel-uek", ++ "kernel-uek-core", ++ "kernel-uek-modules", + "langpacks-en", + "lvm2", + "nvme-cli", +@@ -516,7 +516,7 @@ var defaultAzureImageConfig = &distro.ImageConfig{ + { + Kernel: &osbuild.SysconfigKernelOptions{ + UpdateDefault: true, +- DefaultKernel: "kernel-core", ++ DefaultKernel: "kernel-uek-core", + }, + Network: &osbuild.SysconfigNetworkOptions{ + Networking: true, +diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/bare_metal.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/bare_metal.go +index 0d5fbe0..ac371d8 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/bare_metal.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/bare_metal.go +@@ -142,7 +142,7 @@ func installerPackageSet(t *rhel.ImageType) rpmmd.PackageSet { + "iwl6000-firmware", + "iwl6050-firmware", + "iwl7260-firmware", +- "kernel", ++ "kernel-uek", + "less", + "nfs-utils", + "openssh-clients", +diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/distro.go +index f35f450..39aa5d3 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/distro.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/distro.go +@@ -44,7 +44,7 @@ func defaultDistroImageConfig(d *rhel.Distribution) *distro.ImageConfig { + { + Kernel: &osbuild.SysconfigKernelOptions{ + UpdateDefault: true, +- DefaultKernel: "kernel", ++ DefaultKernel: "kernel-uek", + }, + Network: &osbuild.SysconfigNetworkOptions{ + Networking: true, +@@ -60,10 +60,14 @@ func defaultDistroImageConfig(d *rhel.Distribution) *distro.ImageConfig { + func distroISOLabelFunc(t *rhel.ImageType) string { + const RHEL_ISO_LABEL = "RHEL-%s-%s-0-BaseOS-%s" + const CS_ISO_LABEL = "CentOS-Stream-%s-%s-dvd" ++ const OL_ISO_LABEL = "OL-%s-%s-dvd-%s" + + if t.IsRHEL() { + osVer := strings.Split(t.Arch().Distro().OsVersion(), ".") + return fmt.Sprintf(RHEL_ISO_LABEL, osVer[0], osVer[1], t.Arch().Name()) ++ }else if t.Arch().Distro().Name() == "ol" { ++ osVer := strings.Split(t.Arch().Distro().OsVersion(), ".") ++ return fmt.Sprintf(RHEL_ISO_LABEL, osVer[0], osVer[1], t.Arch().Name()) + } else { + return fmt.Sprintf(CS_ISO_LABEL, t.Arch().Distro().Releasever(), t.Arch().Name()) + } +@@ -418,12 +422,12 @@ func ParseID(idStr string) (*distro.ID, error) { + return nil, err + } + +- if id.Name != "rhel" && id.Name != "centos" { ++ if id.Name != "rhel" && id.Name != "centos" && id.Name != "ol" { + return nil, fmt.Errorf("invalid distro name: %s", id.Name) + } + + // Backward compatibility layer for "rhel-84" or "rhel-810" +- if id.Name == "rhel" && id.MinorVersion == -1 { ++ if (id.Name == "rhel" || id.Name == "ol") && id.MinorVersion == -1 { + if id.MajorVersion/10 == 8 { + // handle single digit minor version + id.MinorVersion = id.MajorVersion % 10 +@@ -445,7 +449,7 @@ func ParseID(idStr string) (*distro.ID, error) { + } + + // RHEL uses minor version +- if id.Name == "rhel" && id.MinorVersion == -1 { ++ if (id.Name == "rhel" || id.Name == "ol") && id.MinorVersion == -1 { + return nil, fmt.Errorf("rhel requires minor version, but got: %d", id.MinorVersion) + } + +diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/ami.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/ami.go +index 5f5cf3f..bb4fa53 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/ami.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/ami.go +@@ -53,7 +53,7 @@ func baseEc2ImageConfig() *distro.ImageConfig { + { + Kernel: &osbuild.SysconfigKernelOptions{ + UpdateDefault: true, +- DefaultKernel: "kernel", ++ DefaultKernel: "kernel-uek", + }, + Network: &osbuild.SysconfigNetworkOptions{ + Networking: true, +diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/bare_metal.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/bare_metal.go +index 22807f3..f98f4c5 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/bare_metal.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/bare_metal.go +@@ -147,7 +147,7 @@ func installerPackageSet(t *rhel.ImageType) rpmmd.PackageSet { + "iwl5150-firmware", + "iwl6050-firmware", + "iwl7260-firmware", +- "kernel", ++ "kernel-uek", + "less", + "nfs-utils", + "openssh-clients", +@@ -257,7 +257,7 @@ func anacondaPackageSet(t *rhel.ImageType) rpmmd.PackageSet { + "kbd", + "kbd-misc", + "kdump-anaconda-addon", +- "kernel", ++ "kernel-uek", + "khmeros-base-fonts", + "less", + "libblockdev-lvm-dbus", +diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/distro.go +index 2e77b6b..6a9ad8c 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/distro.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/distro.go +@@ -43,10 +43,14 @@ var ( + func distroISOLabelFunc(t *rhel.ImageType) string { + const RHEL_ISO_LABEL = "RHEL-%s-%s-0-BaseOS-%s" + const CS_ISO_LABEL = "CentOS-Stream-%s-BaseOS-%s" ++ const OL_ISO_LABEL = "OL-%s-%s-dvd-%s" + + if t.IsRHEL() { + osVer := strings.Split(t.Arch().Distro().OsVersion(), ".") + return fmt.Sprintf(RHEL_ISO_LABEL, osVer[0], osVer[1], t.Arch().Name()) ++ }else if t.Arch().Distro().Name() == "ol" { ++ osVer := strings.Split(t.Arch().Distro().OsVersion(), ".") ++ return fmt.Sprintf(RHEL_ISO_LABEL, osVer[0], osVer[1], t.Arch().Name()) + } else { + return fmt.Sprintf(CS_ISO_LABEL, t.Arch().Distro().Releasever(), t.Arch().Name()) + } +@@ -60,7 +64,7 @@ func defaultDistroImageConfig(d *rhel.Distribution) *distro.ImageConfig { + { + Kernel: &osbuild.SysconfigKernelOptions{ + UpdateDefault: true, +- DefaultKernel: "kernel", ++ DefaultKernel: "kernel-uek", + }, + Network: &osbuild.SysconfigNetworkOptions{ + Networking: true, +@@ -379,12 +383,12 @@ func ParseID(idStr string) (*distro.ID, error) { + return nil, err + } + +- if id.Name != "rhel" && id.Name != "centos" { ++ if id.Name != "rhel" && id.Name != "centos" && id.Name != "ol" { + return nil, fmt.Errorf("invalid distro name: %s", id.Name) + } + + // Backward compatibility layer for "rhel-93" or "rhel-910" +- if id.Name == "rhel" && id.MinorVersion == -1 { ++ if (id.Name == "rhel" || id.Name == "ol") && id.MinorVersion == -1 { + if id.MajorVersion/10 == 9 { + // handle single digit minor version + id.MinorVersion = id.MajorVersion % 10 +@@ -406,7 +410,7 @@ func ParseID(idStr string) (*distro.ID, error) { + } + + // RHEL uses minor version +- if id.Name == "rhel" && id.MinorVersion == -1 { ++ if (id.Name == "rhel" || id.Name == "ol") && id.MinorVersion == -1 { + return nil, fmt.Errorf("rhel requires minor version, but got: %d", id.MinorVersion) + } + +diff --git a/vendor/github.com/osbuild/images/pkg/image/anaconda_live_installer.go b/vendor/github.com/osbuild/images/pkg/image/anaconda_live_installer.go +index 9455fac..1ddcaf9 100644 +--- a/vendor/github.com/osbuild/images/pkg/image/anaconda_live_installer.go ++++ b/vendor/github.com/osbuild/images/pkg/image/anaconda_live_installer.go +@@ -53,7 +53,7 @@ func (img *AnacondaLiveInstaller) InstantiateManifest(m *manifest.Manifest, + buildPipeline, + img.Platform, + repos, +- "kernel", ++ "kernel-uek", + img.Product, + img.OSVersion, + img.Preview, +diff --git a/vendor/github.com/osbuild/images/pkg/image/anaconda_ostree_installer.go b/vendor/github.com/osbuild/images/pkg/image/anaconda_ostree_installer.go +index a88edae..72c83ab 100644 +--- a/vendor/github.com/osbuild/images/pkg/image/anaconda_ostree_installer.go ++++ b/vendor/github.com/osbuild/images/pkg/image/anaconda_ostree_installer.go +@@ -67,7 +67,7 @@ func (img *AnacondaOSTreeInstaller) InstantiateManifest(m *manifest.Manifest, + buildPipeline, + img.Platform, + repos, +- "kernel", ++ "kernel-uek", + img.Product, + img.OSVersion, + img.Preview, +diff --git a/vendor/github.com/osbuild/images/pkg/image/anaconda_tar_installer.go b/vendor/github.com/osbuild/images/pkg/image/anaconda_tar_installer.go +index 27ced33..28b5a78 100644 +--- a/vendor/github.com/osbuild/images/pkg/image/anaconda_tar_installer.go ++++ b/vendor/github.com/osbuild/images/pkg/image/anaconda_tar_installer.go +@@ -114,7 +114,7 @@ func (img *AnacondaTarInstaller) InstantiateManifest(m *manifest.Manifest, + buildPipeline, + img.Platform, + repos, +- "kernel", ++ "kernel-uek", + img.Product, + img.OSVersion, + img.Preview, +diff --git a/vendor/github.com/osbuild/images/pkg/image/ostree_simplified_installer.go b/vendor/github.com/osbuild/images/pkg/image/ostree_simplified_installer.go +index 253c8c1..451d2d0 100644 +--- a/vendor/github.com/osbuild/images/pkg/image/ostree_simplified_installer.go ++++ b/vendor/github.com/osbuild/images/pkg/image/ostree_simplified_installer.go +@@ -86,7 +86,7 @@ func (img *OSTreeSimplifiedInstaller) InstantiateManifest(m *manifest.Manifest, + buildPipeline, + img.Platform, + repos, +- "kernel", ++ "kernel-uek", + img.Product, + img.OSVersion, + ) +diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/azure.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/azure.go +index cb3831d..9db3db7 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/azure.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/azure.go +@@ -98,9 +98,9 @@ func azureCommonPackageSet(t *rhel.ImageType) rpmmd.PackageSet { + "efibootmgr", + "gdisk", + "hyperv-daemons", +- "kernel-core", +- "kernel-modules", +- "kernel", ++ "kernel-uek-core", ++ "kernel-uek-modules", ++ "kernel-uek", + "langpacks-en", + "lvm2", + "NetworkManager", +@@ -430,7 +430,7 @@ func defaultAzureImageConfig(rd *rhel.Distribution) *distro.ImageConfig { + { + Kernel: &osbuild.SysconfigKernelOptions{ + UpdateDefault: true, +- DefaultKernel: "kernel-core", ++ DefaultKernel: "kernel-uek-core", + }, + Network: &osbuild.SysconfigNetworkOptions{ + Networking: true, +-- +2.31.1 + diff --git a/SOURCES/1003-Removing-non-supported-image-types.patch b/SOURCES/1003-Removing-non-supported-image-types.patch new file mode 100644 index 0000000..b3eb0f2 --- /dev/null +++ b/SOURCES/1003-Removing-non-supported-image-types.patch @@ -0,0 +1,454 @@ +From fbe8e69f16021e7a089a8367d96d15ef47ef71a7 Mon Sep 17 00:00:00 2001 +From: Josue David Hernandez Gutierrez +Date: Thu, 31 Oct 2024 01:49:23 +0000 +Subject: [PATCH 3/8] Removing non supported image types + +image types removed are: +Edge Images +Openstack Images +Vmdk Images +GPC Images +MinimalRaw Images +Vmk Images +Ova Images +Wsl Images + +Signed-off-by: Josue David Hernandez Gutierrez +--- + internal/cloudapi/v2/compose_test.go | 54 -------- + .../images/pkg/distro/rhel/rhel8/distro.go | 115 ------------------ + .../images/pkg/distro/rhel/rhel9/distro.go | 113 ----------------- + 3 files changed, 282 deletions(-) + +diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/distro.go +index 7441eb8..24f58be 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/distro.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/distro.go +@@ -97,17 +97,6 @@ func newDistro(name string, minor int) *rhel.Distribution { + mkOCIImgType(rd), + ) + +- x86_64.AddImageTypes( +- &platform.X86{ +- BIOS: true, +- UEFIVendor: rd.Vendor(), +- BasePlatform: platform.BasePlatform{ +- ImageFormat: platform.FORMAT_QCOW2, +- }, +- }, +- mkOpenstackImgType(), +- ) +- + ec2X86Platform := &platform.X86{ + BIOS: true, + UEFIVendor: rd.Vendor(), +@@ -142,50 +131,12 @@ func newDistro(name string, minor int) *rhel.Distribution { + + x86_64.AddImageTypes( + bareMetalX86Platform, +- mkEdgeOCIImgType(rd), +- mkEdgeCommitImgType(rd), +- mkEdgeInstallerImgType(rd), + mkImageInstaller(), + ) + +- gceX86Platform := &platform.X86{ +- UEFIVendor: rd.Vendor(), +- BasePlatform: platform.BasePlatform{ +- ImageFormat: platform.FORMAT_GCE, +- }, +- } +- +- x86_64.AddImageTypes( +- gceX86Platform, +- mkGceImgType(rd), +- ) +- +- x86_64.AddImageTypes( +- &platform.X86{ +- BIOS: true, +- UEFIVendor: rd.Vendor(), +- BasePlatform: platform.BasePlatform{ +- ImageFormat: platform.FORMAT_VMDK, +- }, +- }, +- mkVmdkImgType(), +- ) +- +- x86_64.AddImageTypes( +- &platform.X86{ +- BIOS: true, +- UEFIVendor: rd.Vendor(), +- BasePlatform: platform.BasePlatform{ +- ImageFormat: platform.FORMAT_OVA, +- }, +- }, +- mkOvaImgType(), +- ) +- + x86_64.AddImageTypes( + &platform.X86{}, + mkTarImgType(), +- mkWslImgType(), + ) + + aarch64.AddImageTypes( +@@ -199,20 +150,9 @@ func newDistro(name string, minor int) *rhel.Distribution { + mkQcow2ImgType(rd), + ) + +- aarch64.AddImageTypes( +- &platform.Aarch64{ +- UEFIVendor: rd.Vendor(), +- BasePlatform: platform.BasePlatform{ +- ImageFormat: platform.FORMAT_QCOW2, +- }, +- }, +- mkOpenstackImgType(), +- ) +- + aarch64.AddImageTypes( + &platform.Aarch64{}, + mkTarImgType(), +- mkWslImgType(), + ) + + bareMetalAarch64Platform := &platform.Aarch64{ +@@ -222,9 +162,6 @@ func newDistro(name string, minor int) *rhel.Distribution { + + aarch64.AddImageTypes( + bareMetalAarch64Platform, +- mkEdgeOCIImgType(rd), +- mkEdgeCommitImgType(rd), +- mkEdgeInstallerImgType(rd), + mkImageInstaller(), + ) + +@@ -238,7 +175,6 @@ func newDistro(name string, minor int) *rhel.Distribution { + aarch64.AddImageTypes( + rawAarch64Platform, + mkAmiImgTypeAarch64(), +- mkMinimalRawImgType(), + ) + + ppc64le.AddImageTypes( +@@ -288,44 +224,15 @@ func newDistro(name string, minor int) *rhel.Distribution { + }, + } + +- rawUEFIx86Platform := &platform.X86{ +- BasePlatform: platform.BasePlatform{ +- ImageFormat: platform.FORMAT_RAW, +- }, +- BIOS: false, +- UEFIVendor: rd.Vendor(), +- } +- +- x86_64.AddImageTypes( +- rawUEFIx86Platform, +- mkMinimalRawImgType(), +- ) +- + if rd.IsRHEL() { + if common.VersionGreaterThanOrEqual(rd.OsVersion(), "8.6") { + // image types only available on 8.6 and later on RHEL + // These edge image types require FDO which aren't available on older versions +- x86_64.AddImageTypes( +- bareMetalX86Platform, +- mkEdgeRawImgType(), +- ) +- +- x86_64.AddImageTypes( +- rawUEFIx86Platform, +- mkEdgeSimplifiedInstallerImgType(rd), +- ) +- + x86_64.AddImageTypes( + azureX64Platform, + mkAzureEap7RhuiImgType(), + ) + +- aarch64.AddImageTypes( +- rawAarch64Platform, +- mkEdgeRawImgType(), +- mkEdgeSimplifiedInstallerImgType(rd), +- ) +- + // The Azure image types require hyperv-daemons which isn't available on older versions + aarch64.AddImageTypes( + azureAarch64Platform, +@@ -373,36 +280,14 @@ func newDistro(name string, minor int) *rhel.Distribution { + ) + } + +- // add GCE RHUI image to RHEL only +- x86_64.AddImageTypes( +- gceX86Platform, +- mkGceRhuiImgType(rd), +- ) +- + // add s390x to RHEL distro only + rd.AddArches(s390x) + } else { +- x86_64.AddImageTypes( +- bareMetalX86Platform, +- mkEdgeRawImgType(), +- ) +- +- x86_64.AddImageTypes( +- rawUEFIx86Platform, +- mkEdgeSimplifiedInstallerImgType(rd), +- ) +- + x86_64.AddImageTypes( + azureX64Platform, + mkAzureImgType(), + ) + +- aarch64.AddImageTypes( +- rawAarch64Platform, +- mkEdgeRawImgType(), +- mkEdgeSimplifiedInstallerImgType(rd), +- ) +- + aarch64.AddImageTypes( + azureAarch64Platform, + mkAzureImgType(), +diff --git a/internal/cloudapi/v2/compose_test.go b/internal/cloudapi/v2/compose_test.go +index f7f8dc7..9c815d5 100644 +--- a/internal/cloudapi/v2/compose_test.go ++++ b/internal/cloudapi/v2/compose_test.go +@@ -648,42 +648,6 @@ func TestGetImageRequests_ImageTypeConversion(t *testing.T) { + expectedImageType: "azure-sap-rhui", + expectedTargetName: target.TargetNameAzureImage, + }, +- { +- requestedImageType: ImageTypesEdgeCommit, +- requestedDistros: []string{rhel8, centos8, rhel9, centos9}, +- expectedImageType: "edge-commit", +- expectedTargetName: target.TargetNameAWSS3, +- }, +- { +- requestedImageType: ImageTypesEdgeContainer, +- requestedDistros: []string{rhel8, centos8, rhel9, centos9}, +- expectedImageType: "edge-container", +- expectedTargetName: target.TargetNameContainer, +- }, +- { +- requestedImageType: ImageTypesEdgeInstaller, +- requestedDistros: []string{rhel8, centos8, rhel9, centos9}, +- expectedImageType: "edge-installer", +- expectedTargetName: target.TargetNameAWSS3, +- }, +- { +- requestedImageType: ImageTypesGcp, +- requestedDistros: []string{rhel8, centos8, rhel9, centos9}, +- expectedImageType: "gce", +- expectedTargetName: target.TargetNameGCP, +- }, +- { +- requestedImageType: ImageTypesGcpRhui, +- requestedDistros: []string{rhel9}, +- expectedImageType: "gce", +- expectedTargetName: target.TargetNameGCP, +- }, +- { +- requestedImageType: ImageTypesGcpRhui, +- requestedDistros: []string{rhel8}, +- expectedImageType: "gce-rhui", +- expectedTargetName: target.TargetNameGCP, +- }, + { + requestedImageType: ImageTypesGuestImage, + requestedDistros: []string{fedora, rhel8, centos8, rhel9, centos9}, +@@ -738,36 +702,12 @@ func TestGetImageRequests_ImageTypeConversion(t *testing.T) { + expectedImageType: "live-installer", + expectedTargetName: target.TargetNameAWSS3, + }, +- { +- requestedImageType: ImageTypesMinimalRaw, +- requestedDistros: []string{fedora, rhel8, centos8, rhel9, centos9}, +- expectedImageType: "minimal-raw", +- expectedTargetName: target.TargetNameAWSS3, +- }, + { + requestedImageType: ImageTypesOci, + requestedDistros: []string{fedora, rhel8, centos8, rhel9, centos9}, + expectedImageType: "oci", + expectedTargetName: target.TargetNameOCIObjectStorage, + }, +- { +- requestedImageType: ImageTypesVsphere, +- requestedDistros: []string{fedora, rhel8, centos8, rhel9, centos9}, +- expectedImageType: "vmdk", +- expectedTargetName: target.TargetNameAWSS3, +- }, +- { +- requestedImageType: ImageTypesVsphereOva, +- requestedDistros: []string{fedora, rhel8, centos8, rhel9, centos9}, +- expectedImageType: "ova", +- expectedTargetName: target.TargetNameAWSS3, +- }, +- { +- requestedImageType: ImageTypesWsl, +- requestedDistros: []string{fedora, rhel8, centos8, rhel9, centos9}, +- expectedImageType: "wsl", +- expectedTargetName: target.TargetNameAWSS3, +- }, + } + + for _, tt := range tests { +diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/distro.go +index 0d06b1a..6745702 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/distro.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/distro.go +@@ -103,59 +103,15 @@ func newDistro(name string, major, minor int) *rhel.Distribution { + mkOCIImgType(rd), + ) + +- x86_64.AddImageTypes( +- &platform.X86{ +- BIOS: true, +- UEFIVendor: rd.Vendor(), +- BasePlatform: platform.BasePlatform{ +- ImageFormat: platform.FORMAT_QCOW2, +- }, +- }, +- mkOpenstackImgType(), +- ) +- +- x86_64.AddImageTypes( +- &platform.X86{ +- BIOS: true, +- UEFIVendor: rd.Vendor(), +- BasePlatform: platform.BasePlatform{ +- ImageFormat: platform.FORMAT_VMDK, +- }, +- }, +- mkVMDKImgType(), +- ) +- +- x86_64.AddImageTypes( +- &platform.X86{ +- BIOS: true, +- UEFIVendor: rd.Vendor(), +- BasePlatform: platform.BasePlatform{ +- ImageFormat: platform.FORMAT_OVA, +- }, +- }, +- mkOVAImgType(), +- ) + + x86_64.AddImageTypes( + &platform.X86{}, + mkTarImgType(), +- mkWSLImgType(), +- ) +- +- aarch64.AddImageTypes( +- &platform.Aarch64{ +- UEFIVendor: rd.Vendor(), +- BasePlatform: platform.BasePlatform{ +- ImageFormat: platform.FORMAT_QCOW2, +- }, +- }, +- mkOpenstackImgType(), + ) + + aarch64.AddImageTypes( + &platform.Aarch64{}, + mkTarImgType(), +- mkWSLImgType(), + ) + + aarch64.AddImageTypes( +@@ -248,16 +204,6 @@ func newDistro(name string, major, minor int) *rhel.Distribution { + x86_64.AddImageTypes(azureX64Platform, mkAzureImgType(rd)) + aarch64.AddImageTypes(azureAarch64Platform, mkAzureImgType(rd)) + +- gceX86Platform := &platform.X86{ +- UEFIVendor: rd.Vendor(), +- BasePlatform: platform.BasePlatform{ +- ImageFormat: platform.FORMAT_GCE, +- }, +- } +- x86_64.AddImageTypes( +- gceX86Platform, +- mkGCEImageType(), +- ) + + x86_64.AddImageTypes( + &platform.X86{ +@@ -279,35 +225,7 @@ func newDistro(name string, major, minor int) *rhel.Distribution { + BIOS: true, + UEFIVendor: rd.Vendor(), + }, +- mkEdgeOCIImgType(rd), +- mkEdgeCommitImgType(rd), +- mkEdgeInstallerImgType(), +- mkEdgeRawImgType(rd), + mkImageInstallerImgType(), +- mkEdgeAMIImgType(rd), +- ) +- +- x86_64.AddImageTypes( +- &platform.X86{ +- BasePlatform: platform.BasePlatform{ +- ImageFormat: platform.FORMAT_VMDK, +- }, +- BIOS: true, +- UEFIVendor: rd.Vendor(), +- }, +- mkEdgeVsphereImgType(rd), +- ) +- +- x86_64.AddImageTypes( +- &platform.X86{ +- BasePlatform: platform.BasePlatform{ +- ImageFormat: platform.FORMAT_RAW, +- }, +- BIOS: false, +- UEFIVendor: rd.Vendor(), +- }, +- mkEdgeSimplifiedInstallerImgType(rd), +- mkMinimalrawImgType(), + ) + + aarch64.AddImageTypes( +@@ -315,33 +233,7 @@ func newDistro(name string, major, minor int) *rhel.Distribution { + BasePlatform: platform.BasePlatform{}, + UEFIVendor: rd.Vendor(), + }, +- mkEdgeOCIImgType(rd), +- mkEdgeCommitImgType(rd), +- mkEdgeInstallerImgType(), +- mkEdgeSimplifiedInstallerImgType(rd), + mkImageInstallerImgType(), +- mkEdgeAMIImgType(rd), +- ) +- +- aarch64.AddImageTypes( +- &platform.Aarch64{ +- BasePlatform: platform.BasePlatform{ +- ImageFormat: platform.FORMAT_VMDK, +- }, +- UEFIVendor: rd.Vendor(), +- }, +- mkEdgeVsphereImgType(rd), +- ) +- +- aarch64.AddImageTypes( +- &platform.Aarch64{ +- BasePlatform: platform.BasePlatform{ +- ImageFormat: platform.FORMAT_RAW, +- }, +- UEFIVendor: rd.Vendor(), +- }, +- mkEdgeRawImgType(rd), +- mkMinimalrawImgType(), + ) + + if rd.IsRHEL() { // RHEL-only (non-CentOS) image types +-- +2.31.1 + diff --git a/SOURCES/1004-Fix-packageSets.patch b/SOURCES/1004-Fix-packageSets.patch new file mode 100644 index 0000000..0eeb234 --- /dev/null +++ b/SOURCES/1004-Fix-packageSets.patch @@ -0,0 +1,184 @@ +From 5277761c827d3c8b86544a6e960f53c6f3462450 Mon Sep 17 00:00:00 2001 +From: Josue David Hernandez Gutierrez +Date: Thu, 31 Oct 2024 03:46:51 +0000 +Subject: [PATCH 4/8] Fix packageSets + +Signed-off-by: Josue David Hernandez Gutierrez +--- + .../github.com/osbuild/images/pkg/distro/rhel/rhel8/ami.go | 1 - + .../osbuild/images/pkg/distro/rhel/rhel8/bare_metal.go | 3 --- + .../osbuild/images/pkg/distro/rhel/rhel8/qcow2.go | 2 -- + .../github.com/osbuild/images/pkg/distro/rhel/rhel8/ubi.go | 2 -- + .../github.com/osbuild/images/pkg/distro/rhel/rhel9/ami.go | 1 - + .../osbuild/images/pkg/distro/rhel/rhel9/bare_metal.go | 7 ++----- + .../osbuild/images/pkg/distro/rhel/rhel9/qcow2.go | 5 ++++- + .../github.com/osbuild/images/pkg/distro/rhel/rhel9/ubi.go | 1 - + 8 files changed, 6 insertions(+), 16 deletions(-) + +diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/ami.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/ami.go +index 12f8043..7860629 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/ami.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/ami.go +@@ -343,7 +343,6 @@ func ec2CommonPackageSet(t *rhel.ImageType) rpmmd.PackageSet { + "NetworkManager", + "NetworkManager-cloud-setup", + "redhat-release", +- "redhat-release-eula", + "rsync", + "tar", + "yum-utils", +diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/bare_metal.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/bare_metal.go +index 0d5fbe0..cc463a0 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/bare_metal.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/bare_metal.go +@@ -100,7 +100,6 @@ func bareMetalPackageSet(t *rhel.ImageType) rpmmd.PackageSet { + "python3-jsonschema", + "qemu-guest-agent", + "redhat-release", +- "redhat-release-eula", + "rsync", + "selinux-policy-targeted", + "tar", +@@ -228,7 +227,6 @@ func anacondaPackageSet(t *rhel.ImageType) rpmmd.PackageSet { + "libibverbs", + "libreport-plugin-bugzilla", + "libreport-plugin-reportuploader", +- "libreport-rhel-anaconda-bugzilla", + "librsvg2", + "linux-firmware", + "lklug-fonts", +@@ -258,7 +256,6 @@ func anacondaPackageSet(t *rhel.ImageType) rpmmd.PackageSet { + "pigz", + "python3-pyatspi", + "rdma-core", +- "redhat-release-eula", + "rpm-ostree", + "rsync", + "rsyslog", +diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/qcow2.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/qcow2.go +index a00c516..12a4a07 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/qcow2.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/qcow2.go +@@ -100,7 +100,6 @@ func qcow2CommonPackageSet(t *rhel.ImageType) rpmmd.PackageSet { + "python3-jsonschema", + "qemu-guest-agent", + "redhat-release", +- "redhat-release-eula", + "rsync", + "tar", + "tcpdump", +@@ -112,7 +111,6 @@ func qcow2CommonPackageSet(t *rhel.ImageType) rpmmd.PackageSet { + "alsa-lib", + "alsa-tools-firmware", + "biosdevname", +- "dnf-plugin-spacewalk", + "dracut-config-rescue", + "fedora-release", + "fedora-repos", +diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/ubi.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/ubi.go +index acb08cc..d21a5c4 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/ubi.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/ubi.go +@@ -88,7 +88,6 @@ func ubiCommonPackageSet(t *rhel.ImageType) rpmmd.PackageSet { + "biosdevname", + "cpio", + "diffutils", +- "dnf-plugin-spacewalk", + "dracut", + "elfutils-debuginfod-client", + "fedora-release", +@@ -125,7 +124,6 @@ func ubiCommonPackageSet(t *rhel.ImageType) rpmmd.PackageSet { + "plymouth", + "policycoreutils", + "python3-unbound", +- "redhat-release-eula", + "rng-tools", + "rpm-plugin-selinux", + "rpm-plugin-systemd-inhibit", +diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/ami.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/ami.go +index 5f5cf3f..255fe24 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/ami.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/ami.go +@@ -200,7 +200,6 @@ func ec2CommonPackageSet(t *rhel.ImageType) rpmmd.PackageSet { + "langpacks-en", + "NetworkManager-cloud-setup", + "redhat-release", +- "redhat-release-eula", + "rsync", + "tuned", + "tar", +diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/bare_metal.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/bare_metal.go +index 22807f3..3b89260 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/bare_metal.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/bare_metal.go +@@ -101,15 +101,12 @@ func bareMetalPackageSet(t *rhel.ImageType) rpmmd.PackageSet { + "python3-jsonschema", + "qemu-guest-agent", + "redhat-release", +- "redhat-release-eula", + "rsync", + "tar", + "tcpdump", + "tuned", + }, +- Exclude: []string{ +- "dracut-config-rescue", +- }, ++ Exclude: nil, + }.Append(distroBuildPackageSet(t)) + + if common.VersionLessThan(t.Arch().Distro().OsVersion(), "10.0") { +@@ -134,6 +131,7 @@ func installerPackageSet(t *rhel.ImageType) rpmmd.PackageSet { + "anaconda-dracut", + "curl", + "dracut-config-generic", ++ "dracut-config-rescue", + "dracut-network", + "hostname", + "iwl100-firmware", +@@ -297,7 +295,6 @@ func anacondaPackageSet(t *rhel.ImageType) rpmmd.PackageSet { + "prefixdevname", + "python3-pyatspi", + "rdma-core", +- "redhat-release-eula", + "rng-tools", + "rpcbind", + "rpm-ostree", +diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/qcow2.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/qcow2.go +index 3dfe0a9..dcf1193 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/qcow2.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/qcow2.go +@@ -98,7 +98,6 @@ func qcow2CommonPackageSet(t *rhel.ImageType) rpmmd.PackageSet { + "python3-jsonschema", + "qemu-guest-agent", + "redhat-release", +- "redhat-release-eula", + "rsync", + "tar", + "tuned", +@@ -138,6 +137,10 @@ func qcow2CommonPackageSet(t *rhel.ImageType) rpmmd.PackageSet { + "libertas-sd8787-firmware", + "nss", + "plymouth", ++ "rhn-check", ++ "rhn-setup", ++ "rhnsd", ++ "dnf-plugin-spacewalk", + "rng-tools", + "udisks2", + }, +diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/ubi.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/ubi.go +index f787214..a6440eb 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/ubi.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/ubi.go +@@ -87,7 +87,6 @@ func ubiCommonPackageSet(t *rhel.ImageType) rpmmd.PackageSet { + "glibc-langpack-en", + "openssl-pkcs11", + "python-unversioned-command", +- "redhat-release-eula", + "rpm-plugin-systemd-inhibit", + }, + } +-- +2.43.5 + diff --git a/SOURCES/1005-Increase-support-for-OCI-images.patch b/SOURCES/1005-Increase-support-for-OCI-images.patch new file mode 100644 index 0000000..ce7ee68 --- /dev/null +++ b/SOURCES/1005-Increase-support-for-OCI-images.patch @@ -0,0 +1,677 @@ +From 144326e5255d7df05bce68a084ff6c0d707b8687 Mon Sep 17 00:00:00 2001 +From: Josue David Hernandez Gutierrez +Date: Thu, 31 Oct 2024 01:02:28 +0000 +Subject: [PATCH 05/10] Increase support for OCI images + +Add support for OCI images: +- Support for OCI hybrid images +- Add selinux auto-relabeling during first boot +- Support dnf variables inside OCI built images + +Signed-off-by: Josue David Hernandez Gutierrez +Signed-off-by: Alex Burmashev +--- + .../osbuild/images/pkg/distro/image_config.go | 2 + + .../images/pkg/distro/rhel/distribution.go | 10 +- + .../osbuild/images/pkg/distro/rhel/images.go | 5 + + .../images/pkg/distro/rhel/rhel8/distro.go | 3 +- + .../images/pkg/distro/rhel/rhel8/qcow2.go | 201 +++++++++++++++++- + .../images/pkg/distro/rhel/rhel9/distro.go | 3 +- + .../images/pkg/distro/rhel/rhel9/qcow2.go | 197 ++++++++++++++++- + .../osbuild/images/pkg/manifest/os.go | 14 ++ + 8 files changed, 420 insertions(+), 15 deletions(-) + +diff --git a/vendor/github.com/osbuild/images/pkg/distro/image_config.go b/vendor/github.com/osbuild/images/pkg/distro/image_config.go +index 8cee15e..a7b06fd 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/image_config.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/image_config.go +@@ -45,6 +45,7 @@ type ImageConfig struct { + Modprobe []*osbuild.ModprobeStageOptions + DracutConf []*osbuild.DracutConfStageOptions + SystemdUnit []*osbuild.SystemdUnitStageOptions ++ SystemdUnitCreate []*osbuild.SystemdUnitCreateStageOptions + Authselect *osbuild.AuthselectStageOptions + SELinuxConfig *osbuild.SELinuxConfigStageOptions + Tuned *osbuild.TunedStageOptions +@@ -67,6 +68,7 @@ type ImageConfig struct { + + Files []*fsnode.File + Directories []*fsnode.Directory ++ Hostonly *bool + + // KernelOptionsBootloader controls whether kernel command line options + // should be specified in the bootloader grubenv configuration. Otherwise +diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/distribution.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/distribution.go +index 40fcf8e..55884e7 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/distribution.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/distribution.go +@@ -144,14 +144,14 @@ func NewDistribution(name string, major, minor int) (*Distribution, error) { + } + case "ol": + rd = &Distribution{ +- name: fmt.Sprintf("ol-%d.%d", major, minor), +- product: "Oracle Linux", +- osVersion: fmt.Sprintf("%d.%d", major, minor), ++ name: fmt.Sprintf("ol-%d.%d", major, minor), ++ product: "Oracle Linux", ++ osVersion: fmt.Sprintf("%d.%d", major, minor), + releaseVersion: fmt.Sprintf("%d", major), + modulePlatformID: fmt.Sprintf("platform:el%d", major), +- vendor: "redhat", ++ vendor: "redhat", + ostreeRefTmpl: fmt.Sprintf("ol/%d/%%s/edge", major), +- runner: &runner.RHEL{Major: uint64(major), Minor: uint64(minor)}, ++ runner: &runner.RHEL{Major: uint64(major), Minor: uint64(minor)}, + } + default: + return nil, fmt.Errorf("unknown distro name: %s", name) +diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/images.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/images.go +index 9045bc9..432c349 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/images.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/images.go +@@ -68,6 +68,10 @@ func osCustomizations( + osc.ExcludeDocs = *imageConfig.ExcludeDocs + } + ++ if imageConfig.Hostonly != nil { ++ osc.Hostonly = *imageConfig.Hostonly ++ } ++ + if !t.BootISO { + // don't put users and groups in the payload of an installer + // add them via kickstart instead +@@ -246,6 +250,7 @@ func osCustomizations( + osc.Modprobe = imageConfig.Modprobe + osc.DracutConf = imageConfig.DracutConf + osc.SystemdUnit = imageConfig.SystemdUnit ++ osc.SystemdUnitCreate = imageConfig.SystemdUnitCreate + osc.Authselect = imageConfig.Authselect + osc.SELinuxConfig = imageConfig.SELinuxConfig + osc.Tuned = imageConfig.Tuned +diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/distro.go +index 7539479..3767cf1 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/distro.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/distro.go +@@ -98,7 +98,7 @@ func newDistro(name string, minor int) *rhel.Distribution { + }, + }, + mkQcow2ImgType(rd), +- mkOCIImgType(rd), ++ mkOCIImgType(rd, true), + ) + + ec2X86Platform := &platform.X86{ +@@ -161,6 +161,7 @@ func newDistro(name string, minor int) *rhel.Distribution { + }, + }, + mkQcow2ImgType(rd), ++ mkOCIImgType(rd, false), + ) + + aarch64.AddImageTypes( +diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/qcow2.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/qcow2.go +index fc40edd..96afabd 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/qcow2.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/qcow2.go +@@ -1,11 +1,15 @@ + package rhel8 + + import ( ++ "os" ++ + "github.com/osbuild/images/internal/common" ++ "github.com/osbuild/images/pkg/customizations/fsnode" + "github.com/osbuild/images/pkg/customizations/subscription" + "github.com/osbuild/images/pkg/datasizes" + "github.com/osbuild/images/pkg/distro" + "github.com/osbuild/images/pkg/distro/rhel" ++ "github.com/osbuild/images/pkg/osbuild" + "github.com/osbuild/images/pkg/rpmmd" + ) + +@@ -32,13 +36,13 @@ func mkQcow2ImgType(rd *rhel.Distribution) *rhel.ImageType { + return it + } + +-func mkOCIImgType(rd *rhel.Distribution) *rhel.ImageType { ++func mkOCIImgType(rd *rhel.Distribution, isX86_64 bool) *rhel.ImageType { + it := rhel.NewImageType( + "oci", + "disk.qcow2", + "application/x-qemu-disk", + map[string]rhel.PackageSetFunc{ +- rhel.OSPkgsKey: qcow2CommonPackageSet, ++ rhel.OSPkgsKey: OCIqcow2CommonPackageSet, + }, + rhel.DiskImage, + []string{"build"}, +@@ -46,8 +50,23 @@ func mkOCIImgType(rd *rhel.Distribution) *rhel.ImageType { + []string{"qcow2"}, + ) + +- it.DefaultImageConfig = qcowImageConfig(rd) +- it.KernelOptions = "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto" ++ it.DefaultImageConfig = &distro.ImageConfig{ ++ DefaultTarget: common.ToPtr("multi-user.target"), ++ Hostonly: common.ToPtr(true), ++ SELinuxForceRelabel: common.ToPtr(true), ++ Files: []*fsnode.File{earlySetupFile(isX86_64)}, ++ EnabledServices: []string{"oci-repo-installer.service"}, ++ SystemdUnitCreate: []*osbuild.SystemdUnitCreateStageOptions { ++ ociRepoServiceInstaller(), ++ }, ++ } ++ ++ if isX86_64 { ++ it.KernelOptions = "console=tty0 console=ttyS0,115200n8 no_timer_check rd.net.timeout.dhcp=10 rd.net.timeout.carrier=5 netroot=iscsi:169.254.0.2:::1:iqn.2015-02.oracle.boot:uefi rd.iscsi.param=node.session.timeo.replacement_timeout=6000 net.ifnames=1 nvme_core.shutdown_timeout=10 ipmi_si.tryacpi=0 ipmi_si.trydmi=0 libiscsi.debug_libiscsi_eh=1 loglevel=4 crash_kexec_post_notifiers" ++ } else { ++ it.KernelOptions = "ro crashkernel=auto LANG=en_US.UTF-8 console=ttyAMA0 console=ttyAMA0,115200 rd.net.timeout.carrier=5 netroot=iscsi:169.254.0.2:::1:iqn.2015-02.oracle.boot:uefi rd.iscsi.param=node.session.timeo.replacement_timeout=6000 net.ifnames=1 nvme_core.shutdown_timeout=10 ipmi_si.tryacpi=0 ipmi_si.trydmi=0 libiscsi.debug_libiscsi_eh=1 loglevel=4 ip=dhcp,dhcp6 rd.net.timeout.dhcp=10 crash_kexec_post_notifiers" ++ } ++ + it.Bootable = true + it.DefaultSize = 10 * datasizes.GibiByte + it.BasePartitionTables = defaultBasePartitionTables +@@ -55,6 +74,104 @@ func mkOCIImgType(rd *rhel.Distribution) *rhel.ImageType { + return it + } + ++func earlySetupFile(isX86_64 bool) *fsnode.File { ++ arch := "aarch64" ++ if isX86_64 { ++ arch = "x86_64" ++ } ++ file, err := fsnode.NewFile("/sbin/early-oci-setup", common.ToPtr(os.FileMode(0700)), "root", "root", []byte(`#!/usr/bin/env bash ++arch=` + arch + ` ++ ++imds_domain=$(curl -H "Authorization:Bearer Oracle" -sfm 25 http://169.254.169.254/opc/v2/instance/ 2>/dev/null | jq -r '.regionInfo.realmDomainComponent') ++imds_region=$(curl -H "Authorization:Bearer Oracle" -sfm 25 http://169.254.169.254/opc/v2/instance/ 2>/dev/null | jq -r '.regionInfo.regionIdentifier') ++imds_realm=$(curl -H "Authorization:Bearer Oracle" -sfm 25 http://169.254.169.254/opc/v2/instance/ 2>/dev/null | jq -r '.regionInfo.realmKey') ++ ++function retry_command() { ++ ++ retry_attempts=5 ++ retry_interval_sec=2 ++ while [[ "$retry_attempts" -gt 0 ]]; do ++ command_success=true ++ "$@" || { command_success=false; } ++ if [[ "$command_success" == false ]]; then ++ (( retry_attempts-- )) ++ logger -t earlyocisetup "Error occurred running command $@. Will retry in $retry_interval_sec seconds" ++ sleep $retry_interval_sec ++ else ++ break ++ fi ++ done ++ ++ if [[ "$command_success" == false ]]; then ++ logger -t earlyocisetup "ERROR: failed to execute command '$@' (Retried $retry_attempts times)" ++ exit 1 ++ fi ++} ++ ++if [[ -n "$imds_realm" ]]; then ++ domain="oci.$imds_domain" ++ region="$imds_region" ++ ociregion=".$region" ++ reponame="oci_install" ++ repourl="https://yum$ociregion.$domain/repo/OracleLinux/OL8/oci/included/$arch/" ++else ++ logger -t earlyocisetup 'Running out of OCI region' ++ exit 1 ++fi ++ ++echo $region > /etc/dnf/vars/region ++echo $domain > /etc/dnf/vars/ocidomain ++echo $ociregion > /etc/dnf/vars/ociregion ++ ++cat < /etc/yum.repos.d/oci-install.repo ++[$reponame] ++name=Install OCI repo ($arch) ++baseurl=$repourl ++gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle ++gpgcheck=1 ++enabled=1 ++EOF ++ ++retry_command yum install -y oci-included-release-el8 ++retry_command yum install -y oci-linux-config ++retry_command yum install -y python36-oci-sdk ++ ++if $(yum repolist |grep -q "$reponame"); then ++ rm -f /etc/yum.repos.d/oci-install.repo ++fi ++ ++mkdir -p /var/lib/oci-repo-installer ++touch /var/lib/oci-repo-installer/oci-repo-installed ++ ++rm -f /usr/lib/systemd/system/oci-repo-installer.service /sbin/early-oci-setup ++`)) ++ if err != nil { ++ panic(err) ++ } ++ return file ++} ++ ++func ociRepoServiceInstaller() *osbuild.SystemdUnitCreateStageOptions { ++ return &osbuild.SystemdUnitCreateStageOptions{ ++ Filename: "oci-repo-installer.service", ++ Config: osbuild.SystemdUnit{ ++ Unit: &osbuild.UnitSection{ ++ Description: "First-boot service for installing oci repository once OCI image has booted", ++ ConditionPathExists: []string{"!/var/lib/oci-repo-installer/oci-repo-installed"}, ++ Requires: []string{"network-online.target"}, ++ }, ++ Service: &osbuild.ServiceSection{ ++ Type: osbuild.OneshotServiceType, ++ RemainAfterExit: false, ++ ExecStart: []string{"/usr/bin/bash /sbin/early-oci-setup"}, ++ }, ++ Install: &osbuild.InstallSection{ ++ WantedBy: []string{"network-online.target"}, ++ }, ++ }, ++ } ++} ++ + func mkOpenstackImgType() *rhel.ImageType { + it := rhel.NewImageType( + "openstack", +@@ -77,6 +194,82 @@ func mkOpenstackImgType() *rhel.ImageType { + return it + } + ++func OCIqcow2CommonPackageSet(t *rhel.ImageType) rpmmd.PackageSet { ++ ps := rpmmd.PackageSet{ ++ Include: []string{ ++ "@core", ++ "authselect-compat", ++ "iscsi-initiator-utils", ++ "chrony", ++ "cloud-init", ++ "cloud-utils-growpart", ++ "cockpit-system", ++ "cockpit-ws", ++ "dhcp-client", ++ "dnf", ++ "dnf-utils", ++ "dosfstools", ++ "dracut-norescue", ++ "net-tools", ++ "NetworkManager", ++ "nfs-utils", ++ "oddjob", ++ "oddjob-mkhomedir", ++ "psmisc", ++ "python3-jsonschema", ++ "qemu-guest-agent", ++ "redhat-release", ++ "rsync", ++ "tar", ++ "tcpdump", ++ "yum", ++ "jq", ++ }, ++ Exclude: []string{ ++ "aic94xx-firmware", ++ "alsa-firmware", ++ "alsa-lib", ++ "alsa-tools-firmware", ++ "biosdevname", ++ "dracut-config-rescue", ++ "fedora-release", ++ "fedora-repos", ++ "firewalld", ++ "fwupd", ++ "iprutils", ++ "ivtv-firmware", ++ "iwl1000-firmware", ++ "iwl100-firmware", ++ "iwl105-firmware", ++ "iwl135-firmware", ++ "iwl2000-firmware", ++ "iwl2030-firmware", ++ "iwl3160-firmware", ++ "iwl3945-firmware", ++ "iwl4965-firmware", ++ "iwl5000-firmware", ++ "iwl5150-firmware", ++ "iwl6000-firmware", ++ "iwl6000g2a-firmware", ++ "iwl6000g2b-firmware", ++ "iwl6050-firmware", ++ "iwl7260-firmware", ++ "langpacks-*", ++ "langpacks-en", ++ "langpacks-en", ++ "libertas-sd8686-firmware", ++ "libertas-sd8787-firmware", ++ "libertas-usb8388-firmware", ++ "nss", ++ "plymouth", ++ "rng-tools", ++ "udisks2", ++ }, ++ }.Append(distroSpecificPackageSet(t)) ++ ++ return ps ++} ++ + func qcow2CommonPackageSet(t *rhel.ImageType) rpmmd.PackageSet { + ps := rpmmd.PackageSet{ + Include: []string{ +diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/distro.go +index 6745702..180dab4 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/distro.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/distro.go +@@ -100,7 +100,7 @@ func newDistro(name string, major, minor int) *rhel.Distribution { + }, + }, + mkQcow2ImgType(rd), +- mkOCIImgType(rd), ++ mkOCIImgType(rd, true), + ) + + +@@ -123,6 +123,7 @@ func newDistro(name string, major, minor int) *rhel.Distribution { + }, + }, + mkQcow2ImgType(rd), ++ mkOCIImgType(rd, false), + ) + + ppc64le.AddImageTypes( +diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/qcow2.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/qcow2.go +index 20a8022..8e239b2 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/qcow2.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/qcow2.go +@@ -1,11 +1,15 @@ + package rhel9 + + import ( ++ "os" ++ + "github.com/osbuild/images/internal/common" ++ "github.com/osbuild/images/pkg/customizations/fsnode" + "github.com/osbuild/images/pkg/customizations/subscription" + "github.com/osbuild/images/pkg/datasizes" + "github.com/osbuild/images/pkg/distro" + "github.com/osbuild/images/pkg/distro/rhel" ++ "github.com/osbuild/images/pkg/osbuild" + "github.com/osbuild/images/pkg/rpmmd" + ) + +@@ -32,13 +36,13 @@ func mkQcow2ImgType(d *rhel.Distribution) *rhel.ImageType { + return it + } + +-func mkOCIImgType(d *rhel.Distribution) *rhel.ImageType { ++func mkOCIImgType(d *rhel.Distribution, isX86_64 bool) *rhel.ImageType { + it := rhel.NewImageType( + "oci", + "disk.qcow2", + "application/x-qemu-disk", + map[string]rhel.PackageSetFunc{ +- rhel.OSPkgsKey: qcow2CommonPackageSet, ++ rhel.OSPkgsKey: OCIqcow2CommonPackageSet, + }, + rhel.DiskImage, + []string{"build"}, +@@ -46,8 +50,23 @@ func mkOCIImgType(d *rhel.Distribution) *rhel.ImageType { + []string{"qcow2"}, + ) + +- it.DefaultImageConfig = qcowImageConfig(d) +- it.KernelOptions = "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0" ++ it.DefaultImageConfig = &distro.ImageConfig{ ++ DefaultTarget: common.ToPtr("multi-user.target"), ++ Hostonly: common.ToPtr(true), ++ SELinuxForceRelabel: common.ToPtr(true), ++ Files: []*fsnode.File{earlySetupFile(isX86_64)}, ++ EnabledServices: []string{"oci-repo-installer.service"}, ++ SystemdUnitCreate: []*osbuild.SystemdUnitCreateStageOptions { ++ ociRepoServiceInstaller(), ++ }, ++ } ++ ++ if isX86_64 { ++ it.KernelOptions = "console=tty0 console=ttyS0,115200n8 no_timer_check rd.net.timeout.dhcp=10 rd.net.timeout.carrier=5 netroot=iscsi:169.254.0.2:::1:iqn.2015-02.oracle.boot:uefi rd.iscsi.param=node.session.timeo.replacement_timeout=6000 net.ifnames=1 nvme_core.shutdown_timeout=10 ipmi_si.tryacpi=0 ipmi_si.trydmi=0 libiscsi.debug_libiscsi_eh=1 loglevel=4 crash_kexec_post_notifiers" ++ } else { ++ it.KernelOptions = "ro crashkernel=auto LANG=en_US.UTF-8 console=ttyAMA0 console=ttyAMA0,115200 rd.net.timeout.carrier=5 netroot=iscsi:169.254.0.2:::1:iqn.2015-02.oracle.boot:uefi rd.iscsi.param=node.session.timeo.replacement_timeout=6000 net.ifnames=1 nvme_core.shutdown_timeout=10 ipmi_si.tryacpi=0 ipmi_si.trydmi=0 libiscsi.debug_libiscsi_eh=1 loglevel=4 ip=dhcp,dhcp6 rd.net.timeout.dhcp=10 crash_kexec_post_notifiers" ++ } ++ + it.DefaultSize = 10 * datasizes.GibiByte + it.Bootable = true + it.BasePartitionTables = defaultBasePartitionTables +@@ -55,6 +74,105 @@ func mkOCIImgType(d *rhel.Distribution) *rhel.ImageType { + return it + } + ++func earlySetupFile(isX86_64 bool) *fsnode.File { ++ arch := "aarch64" ++ if isX86_64 { ++ arch = "x86_64" ++ } ++ file, err := fsnode.NewFile("/sbin/early-oci-setup", common.ToPtr(os.FileMode(0700)), "root", "root", []byte(`#!/usr/bin/env bash ++arch=` + arch + ` ++ ++imds_domain=$(curl -H "Authorization:Bearer Oracle" -sfm 25 http://169.254.169.254/opc/v2/instance/ 2>/dev/null | jq -r '.regionInfo.realmDomainComponent') ++imds_region=$(curl -H "Authorization:Bearer Oracle" -sfm 25 http://169.254.169.254/opc/v2/instance/ 2>/dev/null | jq -r '.regionInfo.regionIdentifier') ++imds_realm=$(curl -H "Authorization:Bearer Oracle" -sfm 25 http://169.254.169.254/opc/v2/instance/ 2>/dev/null | jq -r '.regionInfo.realmKey') ++ ++function retry_command() { ++ ++ retry_attempts=5 ++ retry_interval_sec=2 ++ while [[ "$retry_attempts" -gt 0 ]]; do ++ command_success=true ++ "$@" || { command_success=false; } ++ if [[ "$command_success" == false ]]; then ++ (( retry_attempts-- )) ++ logger -t earlyocisetup "Error occurred running command $@. Will retry in $retry_interval_sec seconds" ++ sleep $retry_interval_sec ++ else ++ break ++ fi ++ done ++ ++ if [[ "$command_success" == false ]]; then ++ logger -t earlyocisetup "ERROR: failed to execute command '$@' (Retried $retry_attempts times)" ++ exit 1 ++ fi ++} ++ ++if [[ -n "$imds_realm" ]]; then ++ domain="oci.$imds_domain" ++ region="$imds_region" ++ ociregion=".$region" ++ reponame="oci_install" ++ repourl="https://yum$ociregion.$domain/repo/OracleLinux/OL9/oci/included/$arch/" ++else ++ logger -t earlyocisetup 'Running out of OCI region' ++ exit 1 ++fi ++ ++echo $region > /etc/dnf/vars/region ++echo $domain > /etc/dnf/vars/ocidomain ++echo $ociregion > /etc/dnf/vars/ociregion ++ ++cat < /etc/yum.repos.d/oci-install.repo ++[$reponame] ++name=Install OCI repo ($arch) ++baseurl=$repourl ++gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle ++gpgcheck=1 ++enabled=1 ++EOF ++ ++retry_command yum install -y oci-included-release-el9 ++retry_command yum install -y oci-linux-config ++retry_command yum install -y python39-oci-sdk ++ ++if $(yum repolist |grep -q "$reponame"); then ++ rm -f /etc/yum.repos.d/oci-install.repo ++fi ++ ++mkdir -p /var/lib/oci-repo-installer ++touch /var/lib/oci-repo-installer/oci-repo-installed ++ ++rm -f /usr/lib/systemd/system/oci-repo-installer.service /sbin/early-oci-setup ++ ++`)) ++ if err != nil { ++ panic(err) ++ } ++ return file ++} ++ ++func ociRepoServiceInstaller() *osbuild.SystemdUnitCreateStageOptions { ++ return &osbuild.SystemdUnitCreateStageOptions{ ++ Filename: "oci-repo-installer.service", ++ Config: osbuild.SystemdUnit{ ++ Unit: &osbuild.UnitSection{ ++ Description: "First-boot service for installing oci repository once OCI image has booted", ++ ConditionPathExists: []string{"!/var/lib/oci-repo-installer/oci-repo-installed"}, ++ Requires: []string{"network-online.target"}, ++ }, ++ Service: &osbuild.ServiceSection{ ++ Type: osbuild.OneshotServiceType, ++ RemainAfterExit: false, ++ ExecStart: []string{"/usr/bin/bash /sbin/early-oci-setup"}, ++ }, ++ Install: &osbuild.InstallSection{ ++ WantedBy: []string{"network-online.target"}, ++ }, ++ }, ++ } ++} ++ + func mkOpenstackImgType() *rhel.ImageType { + it := rhel.NewImageType( + "openstack", +@@ -80,6 +198,77 @@ func mkOpenstackImgType() *rhel.ImageType { + return it + } + ++func OCIqcow2CommonPackageSet(t *rhel.ImageType) rpmmd.PackageSet { ++ ps := rpmmd.PackageSet{ ++ Include: []string{ ++ "@core", ++ "authselect-compat", ++ "iscsi-initiator-utils", ++ "chrony", ++ "cloud-init", ++ "cloud-utils-growpart", ++ "cockpit-system", ++ "cockpit-ws", ++ "dnf-utils", ++ "dosfstools", ++ "nfs-utils", ++ "oddjob", ++ "oddjob-mkhomedir", ++ "psmisc", ++ "python3-jsonschema", ++ "qemu-guest-agent", ++ "redhat-release", ++ "rsync", ++ "tar", ++ "tuned", ++ "tcpdump", ++ }, ++ Exclude: []string{ ++ "aic94xx-firmware", ++ "alsa-firmware", ++ "alsa-lib", ++ "alsa-tools-firmware", ++ "biosdevname", ++ "dnf-plugin-spacewalk", ++ "dracut-config-rescue", ++ "fedora-release", ++ "fedora-repos", ++ "firewalld", ++ "iprutils", ++ "ivtv-firmware", ++ "iwl1000-firmware", ++ "iwl100-firmware", ++ "iwl105-firmware", ++ "iwl135-firmware", ++ "iwl2000-firmware", ++ "iwl2030-firmware", ++ "iwl3160-firmware", ++ "iwl3945-firmware", ++ "iwl4965-firmware", ++ "iwl5000-firmware", ++ "iwl5150-firmware", ++ "iwl6000-firmware", ++ "iwl6000g2a-firmware", ++ "iwl6000g2b-firmware", ++ "iwl6050-firmware", ++ "iwl7260-firmware", ++ "langpacks-*", ++ "langpacks-en", ++ "libertas-sd8787-firmware", ++ "nss", ++ "plymouth", ++ "rhn-check", ++ "rhn-setup", ++ "rhnsd", ++ "dnf-plugin-spacewalk", ++ "rng-tools", ++ "udisks2", ++ }, ++ }.Append(distroSpecificPackageSet(t)) ++ ++ return ps ++} ++ + func qcow2CommonPackageSet(t *rhel.ImageType) rpmmd.PackageSet { + ps := rpmmd.PackageSet{ + Include: []string{ +diff --git a/vendor/github.com/osbuild/images/pkg/manifest/os.go b/vendor/github.com/osbuild/images/pkg/manifest/os.go +index 5b5081c..d0b6944 100644 +--- a/vendor/github.com/osbuild/images/pkg/manifest/os.go ++++ b/vendor/github.com/osbuild/images/pkg/manifest/os.go +@@ -107,6 +107,7 @@ type OSCustomizations struct { + Modprobe []*osbuild.ModprobeStageOptions + DracutConf []*osbuild.DracutConfStageOptions + SystemdUnit []*osbuild.SystemdUnitStageOptions ++ SystemdUnitCreate []*osbuild.SystemdUnitCreateStageOptions + Authselect *osbuild.AuthselectStageOptions + SELinuxConfig *osbuild.SELinuxConfigStageOptions + Tuned *osbuild.TunedStageOptions +@@ -144,6 +145,7 @@ type OSCustomizations struct { + CACerts []string + + FIPS bool ++ Hostonly bool + + // NoBLS configures the image bootloader with traditional menu entries + // instead of BLS. Required for legacy systems like RHEL 7. +@@ -541,6 +543,10 @@ func (p *OS) serialize() osbuild.Pipeline { + pipeline.AddStage(osbuild.NewSystemdUnitStage(systemdUnitConfig)) + } + ++ for _, systemdUnitCreateConfig := range p.SystemdUnitCreate { ++ pipeline.AddStage(osbuild.NewSystemdUnitCreateStage(systemdUnitCreateConfig)) ++ } ++ + if p.Authselect != nil { + pipeline.AddStage(osbuild.NewAuthselectStage(p.Authselect)) + } +@@ -620,6 +626,14 @@ func (p *OS) serialize() osbuild.Pipeline { + pipeline.AddStage(osbuild.NewUdevRulesStage(p.UdevRules)) + } + ++ if p.Hostonly { ++ pipeline.AddStage(osbuild.NewDracutStage(&osbuild.DracutStageOptions{ ++ Kernel: []string{p.kernelVer}, ++ EarlyMicrocode: true, ++ Reproducible: true, ++ })) ++ } ++ + if pt := p.PartitionTable; pt != nil { + kernelOptions := osbuild.GenImageKernelOptions(p.PartitionTable) + kernelOptions = append(kernelOptions, p.KernelOptionsAppend...) +-- +2.43.5 + diff --git a/SOURCES/1006-Increase-default-boot-size-to-1GB.patch b/SOURCES/1006-Increase-default-boot-size-to-1GB.patch new file mode 100644 index 0000000..9199546 --- /dev/null +++ b/SOURCES/1006-Increase-default-boot-size-to-1GB.patch @@ -0,0 +1,36 @@ +From 449f4a3f52e0e917397598c698d8f9e4bfc1df1c Mon Sep 17 00:00:00 2001 +From: Darren Archibald +Date: Wed, 29 Jan 2025 04:58:46 -0800 +Subject: [PATCH] Increase default /boot size to 1GB + +Signed-off-by: Josue David Hernandez Gutierrez +Signed-off-by: Alex Burmashev size { +@@ -718,7 +718,7 @@ func (pt *PartitionTable) ensureLVM() error { + // we need a /boot partition to boot LVM, ensure one exists + bootPath := entityPath(pt, "/boot") + if bootPath == nil { +- _, err := pt.CreateMountpoint("/boot", 512*datasizes.MiB) ++ _, err := pt.CreateMountpoint("/boot", 1024*datasizes.MiB) + + if err != nil { + return err +-- +2.31.1 + diff --git a/SOURCES/1007-Support-using-repository-definitions-with-OCI-variab.patch b/SOURCES/1007-Support-using-repository-definitions-with-OCI-variab.patch new file mode 100644 index 0000000..15645a7 --- /dev/null +++ b/SOURCES/1007-Support-using-repository-definitions-with-OCI-variab.patch @@ -0,0 +1,84 @@ +From c708703503955e78cabbdbca3c02feb432c823ff Mon Sep 17 00:00:00 2001 +From: Darren Archibald +Date: Wed, 29 Jan 2025 05:09:44 -0800 +Subject: [PATCH 7/9] Support using repository definitions with OCI variables. + +We can use repository definitions in a format, more similar to generic Oracle repositories +with DNF vars. +Essentially in osbuild-composer log when parsing repos, we at first parse variables, then process +original repo file in memory and replace vars with their values and write modified repo to buffer. +After that we use buffer to actually populate repository data. + +If we have failed to read ocidomain, which is the key variable, we fallback to values to generic public repos. + +Signed-off-by: Alex Burmashev +Signed-off-by: Josue David Hernandez Gutierrez +--- + .../osbuild/images/pkg/rpmmd/repository.go | 42 ++++++++++++++++++- + 1 file changed, 41 insertions(+), 1 deletion(-) + +diff --git a/vendor/github.com/osbuild/images/pkg/rpmmd/repository.go b/vendor/github.com/osbuild/images/pkg/rpmmd/repository.go +index e897a0a..89af861 100644 +--- a/vendor/github.com/osbuild/images/pkg/rpmmd/repository.go ++++ b/vendor/github.com/osbuild/images/pkg/rpmmd/repository.go +@@ -10,6 +10,8 @@ import ( + "strings" + "time" + ++ "bufio" ++ "bytes" + "github.com/gobwas/glob" + ) + +@@ -239,9 +241,47 @@ func LoadRepositoriesFromFile(filename string) (map[string][]RepoConfig, error) + func LoadRepositoriesFromReader(r io.Reader) (map[string][]RepoConfig, error) { + var reposMap map[string][]repository + repoConfigs := make(map[string][]RepoConfig) ++ var ocidomain, ociregion, region []byte + +- err := json.NewDecoder(r).Decode(&reposMap) ++ var OCIlines []string ++ ocidomain = []byte("oracle.com") ++ ociregion = []byte("") ++ region = []byte("") ++ ++ ociregion, err := os.ReadFile("/etc/dnf/vars/ociregion") ++ if err != nil { ++ fmt.Println("Error while reading file: /etc/dnf/vars/ociregion") ++ } ++ region, err = os.ReadFile("/etc/dnf/vars/region") ++ if err != nil { ++ fmt.Println("Error while reading file: /etc/dnf/vars/region") ++ } ++ ocidomain, err = os.ReadFile("/etc/dnf/vars/ocidomain") ++ if err != nil { ++ fmt.Println("Error while reading file: /etc/dnf/vars/ocidomain") ++ } ++ if ocidomain == nil { ++ ocidomain = []byte("oracle.com") ++ ociregion = []byte("") ++ } ++ scanner := bufio.NewScanner(r) ++ OCIreplacer := strings.NewReplacer("$ocidomain", strings.TrimSuffix(string(ocidomain), "\n"), "$ociregion", strings.TrimSuffix(string(ociregion), "\n"), "$region", strings.TrimSuffix(string(region), "\n")) ++ for scanner.Scan() { ++ line := scanner.Text() ++ OCIline := OCIreplacer.Replace(line) ++ OCIlines = append(OCIlines, OCIline) ++ continue ++ } ++ if err := scanner.Err(); err != nil { ++ panic(err) ++ } ++ fOCI := strings.Join(OCIlines, "\n") ++ ++ buf := new(bytes.Buffer) ++ fmt.Fprint(buf, fOCI) ++ err = json.NewDecoder(buf).Decode(&reposMap) + if err != nil { ++ fmt.Println("Error parsing the repo") + return nil, err + } + +-- +2.43.5 + diff --git a/SOURCES/1008-Update-Oracle-repositories-to-contain-OCI-variables.patch b/SOURCES/1008-Update-Oracle-repositories-to-contain-OCI-variables.patch new file mode 100644 index 0000000..43c0149 --- /dev/null +++ b/SOURCES/1008-Update-Oracle-repositories-to-contain-OCI-variables.patch @@ -0,0 +1,121 @@ +From a5781cf7672c32890d6e1694a5d4d1033081b331 Mon Sep 17 00:00:00 2001 +From: Josue David Hernandez Gutierrez +Date: Thu, 31 Oct 2024 02:08:11 +0000 +Subject: [PATCH 8/8] Update Oracle repositories to contain OCI variables + +We now support oci variables for osbuild-composer, so let's actually use them. + +Signed-off-by: Alex Burmashev +Signed-off-by: Josue David Hernandez Gutierrez +--- + repositories/ol-810.json | 12 ++++++------ + repositories/ol-95.json | 12 ++++++------ + 2 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/repositories/ol-810.json b/repositories/ol-810.json +index a23b3c6..e8cffe7 100644 +--- a/repositories/ol-810.json ++++ b/repositories/ol-810.json +@@ -2,19 +2,19 @@ + "aarch64": [ + { + "name": "baseos", +- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/baseos/latest/aarch64", ++ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/baseos/latest/aarch64", + "check_gpg": false, + "rhsm": false + }, + { + "name": "uekr7", +- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/UEKR7/aarch64/", ++ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/UEKR7/aarch64/", + "check_gpg": false, + "rhsm": false + }, + { + "name": "appstream", +- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/appstream/aarch64", ++ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/appstream/aarch64", + "check_gpg": false, + "rhsm": false + } +@@ -22,19 +22,19 @@ + "x86_64": [ + { + "name": "baseos", +- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/baseos/latest/x86_64", ++ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/baseos/latest/x86_64", + "check_gpg": false, + "rhsm": false + }, + { + "name": "uekr7", +- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/UEKR7/x86_64/", ++ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/UEKR7/x86_64/", + "check_gpg": false, + "rhsm": false + }, + { + "name": "appstream", +- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/appstream/x86_64", ++ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/appstream/x86_64", + "check_gpg": false, + "rhsm": false + } +diff --git a/repositories/ol-95.json b/repositories/ol-95.json +index 08b877e..df1c369 100644 +--- a/repositories/ol-95.json ++++ b/repositories/ol-95.json +@@ -2,21 +2,21 @@ + "aarch64": [ + { + "name": "baseos", +- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/aarch64", ++ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/baseos/latest/aarch64", + "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", + "check_gpg": true, + "rhsm": false + }, + { + "name": "uekr8", +- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/UEKR8/aarch64/", ++ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/UEKR8/aarch64/", + "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", + "check_gpg": true, + "rhsm": false + }, + { + "name": "appstream", +- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/appstream/aarch64", ++ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/appstream/aarch64", + "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", + "check_gpg": true, + "rhsm": false +@@ -25,21 +25,21 @@ + "x86_64": [ + { + "name": "baseos", +- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/x86_64", ++ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/baseos/latest/x86_64", + "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", + "check_gpg": true, + "rhsm": false + }, + { + "name": "uekr8", +- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/UEKR8/x86_64/", ++ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/UEKR8/x86_64/", + "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", + "check_gpg": true, + "rhsm": false + }, + { + "name": "appstream", +- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/appstream/x86_64", ++ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/appstream/x86_64", + "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", + "check_gpg": true, + "rhsm": false +-- +2.43.5 + diff --git a/SOURCES/1009-Simplify-repo-name-removing-minor-versions.patch b/SOURCES/1009-Simplify-repo-name-removing-minor-versions.patch new file mode 100644 index 0000000..67caecc --- /dev/null +++ b/SOURCES/1009-Simplify-repo-name-removing-minor-versions.patch @@ -0,0 +1,75 @@ +From d38fff3c8949da2bcb8628dbe67019034fd41c8b Mon Sep 17 00:00:00 2001 +From: Josue David Hernandez Gutierrez +Date: Fri, 15 Nov 2024 19:04:22 +0000 +Subject: [PATCH 9/9] Simplify repo name removing minor versions + +Rename ol-810.json to ol-8.json and ol-95.json to ol-9.json + +Signed-off-by: Josue David Hernandez Gutierrez +Reviewed-by: Alex Burmashev +--- + repositories/{ol-810.json => ol-8.json} | 0 + repositories/{ol-95.json => ol-9.json} | 0 + .../osbuild/images/pkg/distro/rhel/distribution.go | 4 ++-- + .../osbuild/images/pkg/distro/rhel/rhel9/distro.go | 6 +++--- + 4 files changed, 5 insertions(+), 5 deletions(-) + rename repositories/{ol-810.json => ol-8.json} (100%) + rename repositories/{ol-95.json => ol-9.json} (100%) + +diff --git a/repositories/ol-810.json b/repositories/ol-8.json +similarity index 100% +rename from repositories/ol-810.json +rename to repositories/ol-8.json +diff --git a/repositories/ol-95.json b/repositories/ol-9.json +similarity index 100% +rename from repositories/ol-95.json +rename to repositories/ol-9.json +diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/distribution.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/distribution.go +index 90e88b9..404a652 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/distribution.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/distribution.go +@@ -140,9 +140,9 @@ func NewDistribution(name string, major, minor int) (*Distribution, error) { + } + case "ol": + rd = &Distribution{ +- name: fmt.Sprintf("ol-%d.%d", major, minor), ++ name: fmt.Sprintf("ol-%d", major), + product: "Oracle Linux", +- osVersion: fmt.Sprintf("%d.%d", major, minor), ++ osVersion: fmt.Sprintf("%d", major), + releaseVersion: fmt.Sprintf("%d", major), + modulePlatformID: fmt.Sprintf("platform:el%d", major), + vendor: "redhat", +diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/distro.go +index 9fb03d1..c2a2123 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/distro.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/distro.go +@@ -43,14 +43,14 @@ var ( + func distroISOLabelFunc(t *rhel.ImageType) string { + const RHEL_ISO_LABEL = "RHEL-%s-%s-0-BaseOS-%s" + const CS_ISO_LABEL = "CentOS-Stream-%s-BaseOS-%s" +- const OL_ISO_LABEL = "OL-%s-%s-dvd-%s" ++ const OL_ISO_LABEL = "OL-%s-dvd-%s" + + if t.IsRHEL() { + osVer := strings.Split(t.Arch().Distro().OsVersion(), ".") + return fmt.Sprintf(RHEL_ISO_LABEL, osVer[0], osVer[1], t.Arch().Name()) + }else if t.Arch().Distro().Name() == "ol" { + osVer := strings.Split(t.Arch().Distro().OsVersion(), ".") +- return fmt.Sprintf(RHEL_ISO_LABEL, osVer[0], osVer[1], t.Arch().Name()) ++ return fmt.Sprintf(RHEL_ISO_LABEL, osVer[0], t.Arch().Name()) + } else { + return fmt.Sprintf(CS_ISO_LABEL, t.Arch().Distro().Releasever(), t.Arch().Name()) + } +@@ -298,7 +298,7 @@ func ParseID(idStr string) (*distro.ID, error) { + } + + // RHEL uses minor version +- if (id.Name == "rhel" || id.Name == "ol") && id.MinorVersion == -1 { ++ if id.Name == "rhel" && id.MinorVersion == -1 { + return nil, fmt.Errorf("rhel requires minor version, but got: %d", id.MinorVersion) + } + +-- +2.43.5 + diff --git a/SOURCES/1010-Oscap-customization-for-Oracle-Linux.patch b/SOURCES/1010-Oscap-customization-for-Oracle-Linux.patch new file mode 100644 index 0000000..eb49569 --- /dev/null +++ b/SOURCES/1010-Oscap-customization-for-Oracle-Linux.patch @@ -0,0 +1,79 @@ +From fd0b79c73c693fb1c38d83b3199cd44a0c933065 Mon Sep 17 00:00:00 2001 +From: Josue David Hernandez Gutierrez +Date: Thu, 20 Feb 2025 23:54:08 +0000 +Subject: [PATCH] Oscap customization for Oracle Linux + +Signed-off-by: Josue David Hernandez Gutierrez +--- + .../images/pkg/customizations/oscap/oscap.go | 14 ++++++++++---- + .../osbuild/images/pkg/distro/rhel/rhel8/distro.go | 2 +- + .../osbuild/images/pkg/distro/rhel/rhel9/distro.go | 2 +- + 3 files changed, 12 insertions(+), 6 deletions(-) + +diff --git a/vendor/github.com/osbuild/images/pkg/customizations/oscap/oscap.go b/vendor/github.com/osbuild/images/pkg/customizations/oscap/oscap.go +index 5e1d8a3..3af6250 100644 +--- a/vendor/github.com/osbuild/images/pkg/customizations/oscap/oscap.go ++++ b/vendor/github.com/osbuild/images/pkg/customizations/oscap/oscap.go +@@ -41,6 +41,8 @@ const ( + defaultCentos8Datastream string = "/usr/share/xml/scap/ssg/content/ssg-centos8-ds.xml" + defaultCentos9Datastream string = "/usr/share/xml/scap/ssg/content/ssg-cs9-ds.xml" + defaultCentos10Datastream string = "/usr/share/xml/scap/ssg/content/ssg-cs10-ds.xml" ++ defaultOL8Datastream string = "/usr/share/xml/scap/ssg/content/ssg-ol8-ds.xml" ++ defaultOL9Datastream string = "/usr/share/xml/scap/ssg/content/ssg-ol9-ds.xml" + defaultRHEL8Datastream string = "/usr/share/xml/scap/ssg/content/ssg-rhel8-ds.xml" + defaultRHEL9Datastream string = "/usr/share/xml/scap/ssg/content/ssg-rhel9-ds.xml" + defaultRHEL10Datastream string = "/usr/share/xml/scap/ssg/content/ssg-rhel10-ds.xml" +@@ -127,16 +129,20 @@ func DefaultFedoraDatastream() string { + return defaultFedoraDatastream + } + +-func DefaultRHEL8Datastream(isRHEL bool) string { +- if isRHEL { ++func DefaultRHEL8Datastream(name string) string { ++ if strings.HasPrefix(name, "rhel") { + return defaultRHEL8Datastream ++ } else if strings.HasPrefix(name, "ol") { ++ return defaultOL8Datastream + } + return defaultCentos8Datastream + } + +-func DefaultRHEL9Datastream(isRHEL bool) string { +- if isRHEL { ++func DefaultRHEL9Datastream(name string) string { ++ if strings.HasPrefix(name, "rhel") { + return defaultRHEL9Datastream ++ } else if strings.HasPrefix(name, "ol") { ++ return defaultOL9Datastream + } + return defaultCentos9Datastream + } +diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/distro.go +index 3767cf1..10153f7 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/distro.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/distro.go +@@ -53,7 +53,7 @@ func defaultDistroImageConfig(d *rhel.Distribution) *distro.ImageConfig { + }, + }, + KernelOptionsBootloader: common.ToPtr(true), +- DefaultOSCAPDatastream: common.ToPtr(oscap.DefaultRHEL8Datastream(d.IsRHEL())), ++ DefaultOSCAPDatastream: common.ToPtr(oscap.DefaultRHEL8Datastream(d.Name())), + } + } + +diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/distro.go +index 3d8423e..e636d56 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/distro.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/distro.go +@@ -72,7 +72,7 @@ func defaultDistroImageConfig(d *rhel.Distribution) *distro.ImageConfig { + }, + }, + }, +- DefaultOSCAPDatastream: common.ToPtr(oscap.DefaultRHEL9Datastream(d.IsRHEL())), ++ DefaultOSCAPDatastream: common.ToPtr(oscap.DefaultRHEL9Datastream(d.Name())), + } + } + +-- +2.43.5 + diff --git a/SPECS/osbuild-composer.spec b/SPECS/osbuild-composer.spec index 59cf4c7..c7c89da 100644 --- a/SPECS/osbuild-composer.spec +++ b/SPECS/osbuild-composer.spec @@ -8,11 +8,11 @@ %bcond_with relax_requires # The minimum required osbuild version -%global min_osbuild_version 120 +%global min_osbuild_version 139 %global goipath github.com/osbuild/osbuild-composer -Version: 118.2 +Version: 132.2 %gometa @@ -25,7 +25,7 @@ It is compatible with composer-cli and cockpit-composer clients. } Name: osbuild-composer -Release: 1%{?dist} +Release: 1.0.1%{?dist} Summary: An image building service based on osbuild # osbuild-composer doesn't have support for building i686 and armv7hl images @@ -35,6 +35,16 @@ ExcludeArch: i686 armv7hl License: Apache-2.0 URL: %{gourl} Source0: %{gosource} +Patch1001: 1001-Add-repositories-for-OL-8.10-and-OL-9.6.patch +Patch1002: 1002-Add-support-for-OL-on-osbuild-composer.patch +Patch1003: 1003-Removing-non-supported-image-types.patch +Patch1004: 1004-Fix-packageSets.patch +Patch1005: 1005-Increase-support-for-OCI-images.patch +Patch1006: 1006-Increase-default-boot-size-to-1GB.patch +Patch1007: 1007-Support-using-repository-definitions-with-OCI-variab.patch +Patch1008: 1008-Update-Oracle-repositories-to-contain-OCI-variables.patch +Patch1009: 1009-Simplify-repo-name-removing-minor-versions.patch +Patch1010: 1010-Oscap-customization-for-Oracle-Linux.patch BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} @@ -85,11 +95,10 @@ export PATH=$PWD/_bin${PATH:+:$PATH} export GOPATH=$GO_BUILD_PATH:%{gopath} export GOFLAGS+=" -mod=vendor" %endif -%if 0%{?fedora} -# Fedora disables Go modules by default, but we want to use them. -# Undefine the macro which disables it to use the default behavior. + +# Fedora and RHEL versions disable Go modules by default, but we want to use them. +# Unconditionally undefine the macro which disables it to use the default behavior. %undefine gomodulesmode -%endif # btrfs-progs-devel is not available on RHEL %if 0%{?rhel} @@ -167,6 +176,15 @@ install -m 0644 -vp repositories/centos-%{centos}* %{buildroot}% install -m 0644 -vp repositories/centos-stream-%{centos}* %{buildroot}%{_datadir}/osbuild-composer/repositories/ %endif +%else +%if 0%{?oraclelinux} +%if 0%{?oraclelinux} >= 9 +install -m 0644 -vp repositories/ol-* %{buildroot}%{_datadir}/osbuild-composer/repositories/ +%else +install -m 0644 -vp repositories/ol-%{oraclelinux}* %{buildroot}%{_datadir}/osbuild-composer/repositories/ + +%endif + %else %if 0%{?rhel} @@ -197,6 +215,7 @@ done %endif %endif %endif +%endif # Fedora can build for all included fedora releases %if 0%{?fedora} @@ -230,7 +249,6 @@ install -m 0755 -vp tools/define-compose-url.sh %{buildroot}% install -m 0755 -vp tools/provision.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/gen-certs.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/gen-ssh.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ -install -m 0755 -vp tools/image-info %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/run-koji-container.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/koji-compose.py %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/libvirt_test.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ @@ -285,8 +303,8 @@ install -m 0644 -vp test/data/x509/* %{buildroot}% install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/schemas install -m 0644 -vp pkg/jobqueue/dbjobqueue/schemas/* %{buildroot}%{_datadir}/tests/osbuild-composer/schemas/ -install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/upgrade8to9 -install -m 0644 -vp test/data/upgrade8to9/* %{buildroot}%{_datadir}/tests/osbuild-composer/upgrade8to9/ +install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/rhel-upgrade +install -m 0644 -vp test/data/rhel-upgrade/* %{buildroot}%{_datadir}/tests/osbuild-composer/rhel-upgrade/ %endif @@ -326,6 +344,9 @@ cd $PWD/_build/src/%{goipath} %package core Summary: The core osbuild-composer binary Requires: osbuild-depsolve-dnf >= %{min_osbuild_version} +# This version needs to get bumped everytime the osbuild-depsolve-dnf json +# API changes in incompatible ways +Requires: osbuild-dnf-json-api = 8 Provides: %{name}-dnf-json = %{version}-%{release} Obsoletes: %{name}-dnf-json < %{version}-%{release} @@ -452,16 +473,55 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog -* Thu May 08 2025 Darren Archibald - 118.2-1 -- jwt-go allows excessive memory allocation during header parsing (CVE-2025-30204) +* Tue May 20 2025 EL Errata - 132.2-1.0.1 +- Switch to UEKR8 repositories for OL9.6 [Orabug: 37962207] +- Add support to create OpenScap images [JIRA: OLDIS-35301] +- Simplify repository names [JIRA: OLDIS-35893] +- Refactor patches to fix some naming and set a correct kernel for Oracle Linux [Orabug: 37253643] +- Support using OCI variables inside built images [JIRA: OLDIS-35302] +- Support using repository definitons with OCI variables [JIRA: OLDIS-38657] +- Update repositories to contain OCI variables +- Remove image types Minimal-raw and wsl [JIRA: OLDIS-38123] +- Increase default /boot size to 1GB [Orabug: 36827079] +- Add support for OCI hybrid images [JIRA: OLDIS-33593] +- enable aarch64 OCI image builds [JIRA: OLDIS-33593] +- support for building OL8/9 images on Oracle Linux 9 [Orabug: 36400619] -* Wed Apr 23 2025 Teo Gonzalez - 118.1-2 -- osbuild-composer is not able to build RHEL-8 images since RHEL-9.5 RHEL-83780 +* Tue May 20 2025 Craig Guiller - 132.2-1 +- New upstream release -* Wed Sep 25 2024 Tomáš Hozza - 118-2 -- Rebuilt to fix: - - CVE-2024-34156 - - RHEL-57947 +* Tue May 20 2025 Craig Guiller - 132.1-1 +- New upstream release + +* Thu Feb 13 2025 imagebuilder-bot - 132-1 +- New upstream release + +* Wed Feb 05 2025 imagebuilder-bot - 131-1 +- New upstream release + +* Wed Jan 08 2025 imagebuilder-bot - 128-1 +- New upstream release + +* Wed Dec 11 2024 imagebuilder-bot - 127-1 +- New upstream release + +* Wed Nov 27 2024 imagebuilder-bot - 126-1 +- New upstream release + +* Thu Nov 14 2024 imagebuilder-bot - 125-1 +- New upstream release + +* Fri Nov 01 2024 imagebuilder-bot - 124-1 +- New upstream release + +* Wed Oct 16 2024 imagebuilder-bot - 123-1 +- New upstream release + +* Wed Oct 02 2024 imagebuilder-bot - 122-1 +- New upstream release + +* Mon Sep 30 2024 imagebuilder-bot - 121-1 +- New upstream release * Fri Aug 23 2024 imagebuilder-bot - 118-1 - New upstream release