diff --git a/.gitignore b/.gitignore index 40e73ed..44eddf9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ +SOURCES/osbuild-composer-101.4.tar.gz SOURCES/osbuild-composer-101.tar.gz diff --git a/.osbuild-composer.metadata b/.osbuild-composer.metadata index 7f36b97..4d0e409 100644 --- a/.osbuild-composer.metadata +++ b/.osbuild-composer.metadata @@ -1 +1,2 @@ +ce93c5ab93c03de154e13611670b63e764377b52 SOURCES/osbuild-composer-101.4.tar.gz 0feb86b5dcd146ce5b87816ae482eb50ed507c16 SOURCES/osbuild-composer-101.tar.gz diff --git a/SOURCES/1001-Add-Oracle-Linux-8-and-9-support.patch b/SOURCES/1001-Add-Oracle-Linux-8-and-9-support.patch deleted file mode 100644 index a73bf39..0000000 --- a/SOURCES/1001-Add-Oracle-Linux-8-and-9-support.patch +++ /dev/null @@ -1,445 +0,0 @@ -From a59b033a6086f34f667f9dc18638283b0ddefd9b Mon Sep 17 00:00:00 2001 -From: Josue David Hernandez Gutierrez -Date: Wed, 24 Apr 2024 16:52:24 +0000 -Subject: [PATCH 1/5] Add Oracle Linux 8 and 9 support - -Signed-off-by: Josue David Hernandez Gutierrez ---- - repositories/ol-810.json | 34 +++++++++++++++++++ - repositories/ol-94.json | 34 +++++++++++++++++++ - .../osbuild/images/pkg/distro/rhel7/azure.go | 3 -- - .../osbuild/images/pkg/distro/rhel7/qcow2.go | 2 -- - .../osbuild/images/pkg/distro/rhel8/ami.go | 1 - - .../images/pkg/distro/rhel8/bare_metal.go | 4 +-- - .../osbuild/images/pkg/distro/rhel8/distro.go | 19 +++++++++-- - .../osbuild/images/pkg/distro/rhel8/gce.go | 5 --- - .../osbuild/images/pkg/distro/rhel8/qcow2.go | 2 -- - .../osbuild/images/pkg/distro/rhel8/ubi.go | 2 -- - .../osbuild/images/pkg/distro/rhel9/ami.go | 1 - - .../images/pkg/distro/rhel9/bare_metal.go | 7 ++-- - .../osbuild/images/pkg/distro/rhel9/distro.go | 19 +++++++++-- - .../osbuild/images/pkg/distro/rhel9/gce.go | 5 --- - .../osbuild/images/pkg/distro/rhel9/qcow2.go | 5 ++- - .../osbuild/images/pkg/distro/rhel9/ubi.go | 1 - - 16 files changed, 107 insertions(+), 37 deletions(-) - create mode 100644 repositories/ol-810.json - create mode 100644 repositories/ol-94.json - -diff --git a/repositories/ol-810.json b/repositories/ol-810.json -new file mode 100644 -index 0000000..1e5bcf4 ---- /dev/null -+++ b/repositories/ol-810.json -@@ -0,0 +1,34 @@ -+{ -+ "aarch64": [ -+ { -+ "name": "baseos", -+ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/baseos/latest/aarch64", -+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\nVersion: GnuPG v2.0.14 (GNU/Linux)\n\n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\n=dTZ0\n-----END PGP PUBLIC KEY BLOCK-----\n", -+ "check_gpg": true, -+ "rhsm": false -+ }, -+ { -+ "name": "appstream", -+ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/appstream/aarch64", -+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\nVersion: GnuPG v2.0.14 (GNU/Linux)\n\n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\n=dTZ0\n-----END PGP PUBLIC KEY BLOCK-----\n", -+ "check_gpg": true, -+ "rhsm": false -+ } -+ ], -+ "x86_64": [ -+ { -+ "name": "baseos", -+ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/baseos/latest/x86_64", -+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\nVersion: GnuPG v2.0.14 (GNU/Linux)\n\n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\n=dTZ0\n-----END PGP PUBLIC KEY BLOCK-----\n", -+ "check_gpg": true, -+ "rhsm": false -+ }, -+ { -+ "name": "appstream", -+ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/appstream/x86_64", -+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\nVersion: GnuPG v2.0.14 (GNU/Linux)\n\n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\n=dTZ0\n-----END PGP PUBLIC KEY BLOCK-----\n", -+ "check_gpg": true, -+ "rhsm": false -+ } -+ ] -+} -diff --git a/repositories/ol-94.json b/repositories/ol-94.json -new file mode 100644 -index 0000000..bb06b89 ---- /dev/null -+++ b/repositories/ol-94.json -@@ -0,0 +1,34 @@ -+{ -+ "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": "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": "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 -+ } -+ ] -+} -diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel7/azure.go b/vendor/github.com/osbuild/images/pkg/distro/rhel7/azure.go -index 11a956d..87b67da 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel7/azure.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel7/azure.go -@@ -240,17 +240,14 @@ func azureRhuiCommonPackageSet(t *imageType) rpmmd.PackageSet { - "hyperv-daemons", - "kernel", - "lvm2", -- "redhat-release-eula", - "redhat-support-tool", - "rh-dotnetcore11", -- "rhn-setup", - "rhui-azure-rhel7", - "rsync", - "shim-x64", - "tar", - "tcpdump", - "WALinuxAgent", -- "yum-rhn-plugin", - "yum-utils", - }, - Exclude: []string{ -diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel7/qcow2.go b/vendor/github.com/osbuild/images/pkg/distro/rhel7/qcow2.go -index a875fad..51e417c 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel7/qcow2.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel7/qcow2.go -@@ -78,8 +78,6 @@ func qcow2CommonPackageSet(t *imageType) rpmmd.PackageSet { - - "cloud-init", - //"ovirt-guest-agent-common", -- "rhn-setup", -- "yum-rhn-plugin", - "cloud-utils-growpart", - "dracut-config-generic", - "tar", -diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel8/ami.go b/vendor/github.com/osbuild/images/pkg/distro/rhel8/ami.go -index e8c47cb..080f8cc 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel8/ami.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel8/ami.go -@@ -351,7 +351,6 @@ func ec2CommonPackageSet(t *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/rhel8/bare_metal.go b/vendor/github.com/osbuild/images/pkg/distro/rhel8/bare_metal.go -index 05c54e5..93ea5e8 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel8/bare_metal.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel8/bare_metal.go -@@ -86,7 +86,6 @@ func bareMetalPackageSet(t *imageType) rpmmd.PackageSet { - "python3-jsonschema", - "qemu-guest-agent", - "redhat-release", -- "redhat-release-eula", - "rsync", - "selinux-policy-targeted", - "tar", -@@ -114,6 +113,7 @@ func installerPackageSet(t *imageType) rpmmd.PackageSet { - "anaconda-dracut", - "curl", - "dracut-config-generic", -+ "dracut-config-rescue", - "dracut-network", - "hostname", - "iwl100-firmware", -@@ -214,7 +214,6 @@ func anacondaPackageSet(t *imageType) rpmmd.PackageSet { - "libibverbs", - "libreport-plugin-bugzilla", - "libreport-plugin-reportuploader", -- "libreport-rhel-anaconda-bugzilla", - "librsvg2", - "linux-firmware", - "lklug-fonts", -@@ -244,7 +243,6 @@ func anacondaPackageSet(t *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/rhel8/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go -index c20d26a..299e61d 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go -@@ -152,6 +152,19 @@ func newDistro(name string, minor int) *distribution { - runner: &runner.CentOS{Version: uint64(8)}, - defaultImageConfig: defaultDistroImageConfig, - } -+ case "ol": -+ rd = distribution{ -+ name: fmt.Sprintf("ol-8.%d", minor), -+ product: "Oracle Linux", -+ osVersion: fmt.Sprintf("8.%d", minor), -+ releaseVersion: "8", -+ modulePlatformID: "platform:el8", -+ vendor: "redhat", -+ ostreeRefTmpl: "ol/8/%s/edge", -+ isolabelTmpl: fmt.Sprintf("OL-8-%d-dvd-%%s", minor), -+ runner: &runner.RHEL{Major: uint64(8), Minor: uint64(minor)}, -+ defaultImageConfig: defaultDistroImageConfig, -+ } - default: - panic(fmt.Sprintf("unknown distro name: %s", name)) - } -@@ -483,12 +496,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 -@@ -510,7 +523,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/rhel8/gce.go b/vendor/github.com/osbuild/images/pkg/distro/rhel8/gce.go -index 98b870d..cfbb2cb 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel8/gce.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel8/gce.go -@@ -230,11 +230,6 @@ func gceCommonPackageSet(t *imageType) rpmmd.PackageSet { - "tar", - "vim", - -- // GCE guest tools -- "google-compute-engine", -- "google-osconfig-agent", -- "gce-disk-expand", -- - // Not explicitly included in GCP kickstart, but present on the image - // for time synchronization - "chrony", -diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel8/qcow2.go b/vendor/github.com/osbuild/images/pkg/distro/rhel8/qcow2.go -index 6e47113..ac0ce48 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel8/qcow2.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel8/qcow2.go -@@ -90,7 +90,6 @@ func qcow2CommonPackageSet(t *imageType) rpmmd.PackageSet { - "python3-jsonschema", - "qemu-guest-agent", - "redhat-release", -- "redhat-release-eula", - "rsync", - "tar", - "tcpdump", -@@ -102,7 +101,6 @@ func qcow2CommonPackageSet(t *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/rhel8/ubi.go b/vendor/github.com/osbuild/images/pkg/distro/rhel8/ubi.go -index 9ffdb83..838a280 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel8/ubi.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel8/ubi.go -@@ -85,7 +85,6 @@ func ubiCommonPackageSet(t *imageType) rpmmd.PackageSet { - "biosdevname", - "cpio", - "diffutils", -- "dnf-plugin-spacewalk", - "dracut", - "elfutils-debuginfod-client", - "fedora-release", -@@ -122,7 +121,6 @@ func ubiCommonPackageSet(t *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/rhel9/ami.go b/vendor/github.com/osbuild/images/pkg/distro/rhel9/ami.go -index 578833f..3ac96af 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel9/ami.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel9/ami.go -@@ -313,7 +313,6 @@ func ec2CommonPackageSet(t *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/rhel9/bare_metal.go b/vendor/github.com/osbuild/images/pkg/distro/rhel9/bare_metal.go -index 0429adb..436ba0c 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel9/bare_metal.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel9/bare_metal.go -@@ -79,15 +79,12 @@ func bareMetalPackageSet(t *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)) - - // Ensure to not pull in subscription-manager on non-RHEL distro -@@ -108,6 +105,7 @@ func installerPackageSet(t *imageType) rpmmd.PackageSet { - "anaconda-dracut", - "curl", - "dracut-config-generic", -+ "dracut-config-rescue", - "dracut-network", - "hostname", - "iwl100-firmware", -@@ -271,7 +269,6 @@ func anacondaPackageSet(t *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/rhel9/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go -index a3b57a9..bbd8d41 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go -@@ -154,6 +154,19 @@ func newDistro(name string, minor int) *distribution { - runner: &runner.CentOS{Version: uint64(9)}, - defaultImageConfig: defaultDistroImageConfig, - } -+ case "ol": -+ rd = distribution{ -+ name: fmt.Sprintf("ol-9.%d", minor), -+ product: "Oracle Linux", -+ osVersion: fmt.Sprintf("9.%d", minor), -+ releaseVersion: "9", -+ modulePlatformID: "platform:el9", -+ vendor: "redhat", -+ ostreeRefTmpl: "ol/9/%s/edge", -+ isolabelTmpl: fmt.Sprintf("OL-9-%d-dvd-%%s", minor), -+ runner: &runner.RHEL{Major: uint64(9), Minor: uint64(minor)}, -+ defaultImageConfig: defaultDistroImageConfig, -+ } - default: - panic(fmt.Sprintf("unknown distro name: %s", name)) - } -@@ -470,12 +483,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 -@@ -497,7 +510,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/rhel9/gce.go b/vendor/github.com/osbuild/images/pkg/distro/rhel9/gce.go -index 8c8c4d3..21d89b0 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel9/gce.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel9/gce.go -@@ -226,11 +226,6 @@ func gceCommonPackageSet(t *imageType) rpmmd.PackageSet { - "tar", - "vim", - -- // GCE guest tools -- "google-compute-engine", -- "google-osconfig-agent", -- "gce-disk-expand", -- - // Not explicitly included in GCP kickstart, but present on the image - // for time synchronization - "chrony", -diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel9/qcow2.go b/vendor/github.com/osbuild/images/pkg/distro/rhel9/qcow2.go -index 7efea8c..f45e3b5 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel9/qcow2.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel9/qcow2.go -@@ -49,7 +49,6 @@ func qcow2CommonPackageSet(t *imageType) rpmmd.PackageSet { - "python3-jsonschema", - "qemu-guest-agent", - "redhat-release", -- "redhat-release-eula", - "rsync", - "tar", - "tuned", -@@ -89,6 +88,10 @@ func qcow2CommonPackageSet(t *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/rhel9/ubi.go b/vendor/github.com/osbuild/images/pkg/distro/rhel9/ubi.go -index d49e653..6346b79 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel9/ubi.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel9/ubi.go -@@ -82,7 +82,6 @@ func ubiCommonPackageSet(t *imageType) rpmmd.PackageSet { - "glibc-langpack-en", - "openssl-pkcs11", - "python-unversioned-command", -- "redhat-release-eula", - "rpm-plugin-systemd-inhibit", - }, - } --- -2.39.3 - diff --git a/SOURCES/1002-remove-edge-openstack-and-vmdk-options-for-rhel8-and.patch b/SOURCES/1002-remove-edge-openstack-and-vmdk-options-for-rhel8-and.patch deleted file mode 100644 index fb82570..0000000 --- a/SOURCES/1002-remove-edge-openstack-and-vmdk-options-for-rhel8-and.patch +++ /dev/null @@ -1,306 +0,0 @@ -From fbdfe5b65e7b865ec7f01c84200a6c479dfce824 Mon Sep 17 00:00:00 2001 -From: Josue David Hernandez Gutierrez -Date: Tue, 16 Apr 2024 18:59:52 +0000 -Subject: [PATCH 2/5] remove edge, openstack and vmdk options for rhel8 and - rhel9 - -Signed-off-by: Josue David Hernandez Gutierrez ---- - internal/cloudapi/v2/compose_test.go | 24 ------- - .../osbuild/images/pkg/distro/rhel8/distro.go | 70 ------------------- - .../osbuild/images/pkg/distro/rhel9/distro.go | 65 ----------------- - 3 files changed, 159 deletions(-) - -diff --git a/internal/cloudapi/v2/compose_test.go b/internal/cloudapi/v2/compose_test.go -index 0984282..a966ced 100644 ---- a/internal/cloudapi/v2/compose_test.go -+++ b/internal/cloudapi/v2/compose_test.go -@@ -529,24 +529,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}, -@@ -625,12 +607,6 @@ func TestGetImageRequests_ImageTypeConversion(t *testing.T) { - 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}, -diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go -index 299e61d..a843936 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go -@@ -205,17 +205,6 @@ func newDistro(name string, minor int) *distribution { - ociImgType, - ) - -- x86_64.addImageTypes( -- &platform.X86{ -- BIOS: true, -- UEFIVendor: rd.vendor, -- BasePlatform: platform.BasePlatform{ -- ImageFormat: platform.FORMAT_QCOW2, -- }, -- }, -- openstackImgType(), -- ) -- - ec2X86Platform := &platform.X86{ - BIOS: true, - UEFIVendor: rd.vendor, -@@ -250,9 +239,6 @@ func newDistro(name string, minor int) *distribution { - - x86_64.addImageTypes( - bareMetalX86Platform, -- edgeOCIImgType(rd), -- edgeCommitImgType(rd), -- edgeInstallerImgType(rd), - imageInstaller(), - ) - -@@ -268,17 +254,6 @@ func newDistro(name string, minor int) *distribution { - gceImgType(rd), - ) - -- x86_64.addImageTypes( -- &platform.X86{ -- BIOS: true, -- UEFIVendor: rd.vendor, -- BasePlatform: platform.BasePlatform{ -- ImageFormat: platform.FORMAT_VMDK, -- }, -- }, -- vmdkImgType(), -- ) -- - x86_64.addImageTypes( - &platform.X86{ - BIOS: true, -@@ -307,16 +282,6 @@ func newDistro(name string, minor int) *distribution { - qcow2ImgType(rd), - ) - -- aarch64.addImageTypes( -- &platform.Aarch64{ -- UEFIVendor: rd.vendor, -- BasePlatform: platform.BasePlatform{ -- ImageFormat: platform.FORMAT_QCOW2, -- }, -- }, -- openstackImgType(), -- ) -- - aarch64.addImageTypes( - &platform.Aarch64{}, - tarImgType(), -@@ -330,9 +295,6 @@ func newDistro(name string, minor int) *distribution { - - aarch64.addImageTypes( - bareMetalAarch64Platform, -- edgeOCIImgType(rd), -- edgeCommitImgType(rd), -- edgeInstallerImgType(rd), - imageInstaller(), - ) - -@@ -413,25 +375,9 @@ func newDistro(name string, minor int) *distribution { - if !common.VersionLessThan(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, -- edgeRawImgType(), -- ) -- -- x86_64.addImageTypes( -- rawUEFIx86Platform, -- edgeSimplifiedInstallerImgType(rd), -- ) -- - azureEap := azureEap7RhuiImgType() - x86_64.addImageTypes(azureX64Platform, azureEap) - -- aarch64.addImageTypes( -- rawAarch64Platform, -- edgeRawImgType(), -- edgeSimplifiedInstallerImgType(rd), -- ) -- - // The Azure image types require hyperv-daemons which isn't available on older versions - aarch64.addImageTypes(azureAarch64Platform, azureRhuiImgType(), azureByosImgType()) - } -@@ -466,24 +412,8 @@ func newDistro(name string, minor int) *distribution { - // add s390x to RHEL distro only - rd.addArches(s390x) - } else { -- x86_64.addImageTypes( -- bareMetalX86Platform, -- edgeRawImgType(), -- ) -- -- x86_64.addImageTypes( -- rawUEFIx86Platform, -- edgeSimplifiedInstallerImgType(rd), -- ) -- - x86_64.addImageTypes(azureX64Platform, azureImgType()) - -- aarch64.addImageTypes( -- rawAarch64Platform, -- edgeRawImgType(), -- edgeSimplifiedInstallerImgType(rd), -- ) -- - aarch64.addImageTypes(azureAarch64Platform, azureImgType()) - } - rd.addArches(x86_64, aarch64, ppc64le) -diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go -index cddc189..8fbba10 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go -@@ -209,17 +209,6 @@ func newDistro(name string, minor int) *distribution { - ociImgType, - ) - -- x86_64.addImageTypes( -- &platform.X86{ -- BIOS: true, -- UEFIVendor: rd.vendor, -- BasePlatform: platform.BasePlatform{ -- ImageFormat: platform.FORMAT_QCOW2, -- }, -- }, -- openstackImgType, -- ) -- - azureX64Platform := &platform.X86{ - BIOS: true, - UEFIVendor: rd.vendor, -@@ -235,17 +224,6 @@ func newDistro(name string, minor int) *distribution { - }, - } - -- x86_64.addImageTypes( -- &platform.X86{ -- BIOS: true, -- UEFIVendor: rd.vendor, -- BasePlatform: platform.BasePlatform{ -- ImageFormat: platform.FORMAT_VMDK, -- }, -- }, -- vmdkImgType, -- ) -- - x86_64.addImageTypes( - &platform.X86{ - BIOS: true, -@@ -300,23 +278,7 @@ func newDistro(name string, minor int) *distribution { - BIOS: true, - UEFIVendor: rd.vendor, - }, -- edgeOCIImgType, -- edgeCommitImgType, -- edgeInstallerImgType, -- edgeRawImgType, - imageInstaller, -- edgeAMIImgType, -- ) -- -- x86_64.addImageTypes( -- &platform.X86{ -- BasePlatform: platform.BasePlatform{ -- ImageFormat: platform.FORMAT_VMDK, -- }, -- BIOS: true, -- UEFIVendor: rd.vendor, -- }, -- edgeVsphereImgType, - ) - - x86_64.addImageTypes( -@@ -327,7 +289,6 @@ func newDistro(name string, minor int) *distribution { - BIOS: false, - UEFIVendor: rd.vendor, - }, -- edgeSimplifiedInstallerImgType, - minimalrawImgType, - ) - -@@ -337,16 +298,6 @@ func newDistro(name string, minor int) *distribution { - wslImgType, - ) - -- aarch64.addImageTypes( -- &platform.Aarch64{ -- UEFIVendor: rd.vendor, -- BasePlatform: platform.BasePlatform{ -- ImageFormat: platform.FORMAT_QCOW2, -- }, -- }, -- openstackImgType, -- ) -- - aarch64.addImageTypes( - &platform.Aarch64{}, - tarImgType, -@@ -358,22 +309,7 @@ func newDistro(name string, minor int) *distribution { - BasePlatform: platform.BasePlatform{}, - UEFIVendor: rd.vendor, - }, -- edgeCommitImgType, -- edgeOCIImgType, -- edgeInstallerImgType, -- edgeSimplifiedInstallerImgType, - imageInstaller, -- edgeAMIImgType, -- ) -- -- aarch64.addImageTypes( -- &platform.Aarch64{ -- BasePlatform: platform.BasePlatform{ -- ImageFormat: platform.FORMAT_VMDK, -- }, -- UEFIVendor: rd.vendor, -- }, -- edgeVsphereImgType, - ) - - aarch64.addImageTypes( -@@ -383,7 +319,6 @@ func newDistro(name string, minor int) *distribution { - }, - UEFIVendor: rd.vendor, - }, -- edgeRawImgType, - minimalrawImgType, - ) - --- -2.43.0 - diff --git a/SOURCES/1003-Add-UEK-repositories-and-set-uek-kernel-as-default.patch b/SOURCES/1003-Add-UEK-repositories-and-set-uek-kernel-as-default.patch deleted file mode 100644 index c360f05..0000000 --- a/SOURCES/1003-Add-UEK-repositories-and-set-uek-kernel-as-default.patch +++ /dev/null @@ -1,277 +0,0 @@ -From 17d9d3d3de9c3a3046e1bede73c93c22d6e0af3f Mon Sep 17 00:00:00 2001 -From: Josue David Hernandez Gutierrez -Date: Tue, 7 May 2024 18:51:48 +0000 -Subject: [PATCH 3/5] Add UEK repositories and set uek kernel as default - -Signed-off-by: Josue David Hernandez Gutierrez ---- - repositories/ol-810.json | 14 ++++++++++++++ - repositories/ol-94.json | 14 ++++++++++++++ - .../osbuild/images/pkg/blueprint/customizations.go | 2 +- - .../osbuild/images/pkg/distro/rhel8/ami.go | 2 +- - .../osbuild/images/pkg/distro/rhel8/azure.go | 6 +++--- - .../osbuild/images/pkg/distro/rhel8/bare_metal.go | 2 +- - .../osbuild/images/pkg/distro/rhel8/distro.go | 2 +- - .../osbuild/images/pkg/distro/rhel9/ami.go | 2 +- - .../osbuild/images/pkg/distro/rhel9/azure.go | 6 +++--- - .../osbuild/images/pkg/distro/rhel9/bare_metal.go | 4 ++-- - .../osbuild/images/pkg/distro/rhel9/distro.go | 2 +- - .../images/pkg/image/anaconda_live_installer.go | 2 +- - .../images/pkg/image/anaconda_ostree_installer.go | 2 +- - .../images/pkg/image/anaconda_tar_installer.go | 2 +- - .../pkg/image/ostree_simplified_installer.go | 2 +- - 15 files changed, 46 insertions(+), 18 deletions(-) - -diff --git a/repositories/ol-810.json b/repositories/ol-810.json -index 1e5bcf4..1332c79 100644 ---- a/repositories/ol-810.json -+++ b/repositories/ol-810.json -@@ -7,6 +7,13 @@ - "check_gpg": true, - "rhsm": false - }, -+ { -+ "name": "uekr7", -+ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/UEKR7/aarch64/", -+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\nVersion: GnuPG v2.0.14 (GNU/Linux)\n\n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\n=dTZ0\n-----END PGP PUBLIC KEY BLOCK-----\n", -+ "check_gpg": true, -+ "rhsm": false -+ }, - { - "name": "appstream", - "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/appstream/aarch64", -@@ -23,6 +30,13 @@ - "check_gpg": true, - "rhsm": false - }, -+ { -+ "name": "uekr7", -+ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/UEKR7/x86_64/", -+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\nVersion: GnuPG v2.0.14 (GNU/Linux)\n\nmQINBFyr9g0BEADVpB339zKe27a0LAQn4jWDYfX4ttCgYbX1sgyOKclO2ZMxdLIF\n2Tz1KrmLim0am6ltTYIVpP0hVHsH1iy7MaVg1K/vaYIS8djL3SrmjX70P3QKIru5\nHr8iGOKvX4jMHbUZmghZyVRdvl2QNc9oh+l+i3CzyChFlNV3dGlmsaBRT6o5Ecvn\nZQ8cVdsbFnRAYpCDO65wOCujWNVe2F5eA6xy4mQfVOCuF7jY1sb4zRanTVE0hZyy\nig6OeTZjutjr7V+kDrT5K3PdXn2kPsVWcEdJJOta+hqJ9wnA1aiTJNNpvRP6fJtv\niw8poJqJID7VUPTfGp38k6sPfe4BmqEfRSUbNT5JKCFvlp4Y39pHzmKfX+8jjeZ2\nXgBx/Z4GsW6q/tAOksZ8nHB/XIPZkr6V+tXXZP4D5peNIWLxhza585FDiGi8d1Z4\nKIMpeqJhUu24vre9rmYn2wOFP6GYZfi1KOMImAjQC13BktpAlSqDNzCQepoNfvoG\niO8v0sO8mHy16fpp+hk7T4hveScoYYIBaTMcdTElvPjA5mgXTaBF/qttF1LlFf51\nPvNkKQVoCR7V9+puZGsWeq9Kv+GaUYC3uKo96MKCO4G34uSu9uYo4eZ3yr7GslSM\n6rB0Fi4yfDT9R9mS8YHpuCKhgQ5IUBl6x72h1s02+maheeH0CZMbV/7hEwARAQAB\ntERPcmFjbGUgT1NTIGdyb3VwIChPcGVuIFNvdXJjZSBTb2Z0d2FyZSBncm91cCkg\nPGJ1aWxkQG9zcy5vcmFjbGUuY29tPokCPgQTAQIAKAUCXKv2DQIbAwUJJZgGAAYL\nCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQglYuqa2YbaN53w/+Lx4cqKifslEa\nBpWz4yqHcAtuz25sCW4wbH4V56EfKZAh+WQ/JwPFybSywqbzgIUrIlzg8CMuUnKM\n5BElUkKPDYI+CjvUtP0B9eFThqjp7WNly0IQX8qC6p/gTLDXuEbKLj+EfLvKihqc\nL2tJIaQWiQAaftG5DFHIanZpVr88eXJwAMCle/m29x7K4g0c959vZdFF7iggIcHl\nTJ3GWGbLzRXi0fXVTQJAltR5Gx+FnRnSmAplL6j1UG1cgesZrfJZbNsl0+5Eq4oH\nUN3sTgaqTYaMWR7jH6HFF+5d05ndpltLXbG6Ia1c1Z4e+ha2ehBnceBxSCt5VT5z\ntmvJCm4QT4+S8AKsdQLpx3XWTWs5B41DYy3yQHaQz+So42YEtvGCemPsCfkid8ZN\nEltl9KM0iHYJbFehv2ckZe4RVNEDVgurlnEEKICvhfwS4bz2IQZPSYQLGLmUYwpp\nkf2VjkDhTQUMp1iqLXsolCjDfTcZrlUaAEXP7A1wuLBlAEHE/yZOZbqcgE4AZKkV\nnJYmu2lrSkNhisMOVsVhDyCyFEw1+fD+RnvR9uNHOqgeTV/6kOyGu+nC8dnwKyq0\nwLJzu+8ENdemcvld9pwx3FPWTGQ4GGNJ3MVdwfwnYkg5vKGDSOmPDuEnnxkaPJrT\nJIHSJXfjSg/M0PiLGXcOMpGVNebpSQK5Ag0EXKv2DQEQAKHZmlvNo+/+amYh9Ogn\nlzSUctqLENke8m7Q7HXUakEZgTfRU0an+9TmfoUCyHS11q3A0l+FoB/FBT45ByxU\ndf850oQd0PApqo5NxNpQCqYgOCOpTHT0SnRh9gQCDGgzfYSZl8ME+izEU5WOjQ51\ng/2ajODXGIWHPwYE8lZyF7tE7bFNEwve7sIrQefAR0eASz8PMFdQ5US/vYZQ+jeL\nU2dZqfl2B7AnP7MuXpa31MkhB3laYdH+vWaQLPbk/bh7cvKtkDbDHY13NS2nTpWy\nfjeUCFpDHupzMNkclc0If44WKA1a0sO7d6mBWyVM0IgrCxieXJ/EZVFkhXEulcGu\n+L0iHhkR9NA6dRXvC/wJnsCASjzxFqyzlhTfNR1QwWdZJpC8Il9oH3VcrT4TtEvJ\nDxuXTMqeMSOfNSsdqaiE9u6tgbC13qBTvbsoBg9Rs2hY2nRqUhNhvMoRbt1U1qXw\nhn/9g1f+1i3GvED6j2AuWMnU9zehR32iuGQl48ko428bREPz08AY++v3/n4U/cbs\noJzAvCg1+WYQe26v0mIJIuzOmeFRmXcaTHUZvyY6aqSvQeOno0h1cjRZAN9T6Z8q\nlYbwh8yhGNlfybQPmld/oeiDNVr43sSl6W02TOLFZ36h2eGpt2LKUVz+zFQwrAdF\nu6Uo/1lgGRGbzBezNgUCkQCLABEBAAGJAiUEGAECAA8FAlyr9g0CGwwFCSWYBgAA\nCgkQglYuqa2YbaO4Eg//WREjdHosvTLPbjDwmtH0R3Twis/eqHPSq57I9jDSOvRD\nWkv4/CidBu1+FsTDpInn4wiAIE9eMb/L89Cc2Y5LyzHlzORJMEgzEqcjIewqRcEy\nvMbyTnx4Gc4hKiMhRcMLWQuWp6/JT09+B3oPzQLXHvuAuKu0ZjFJl16obdoL7tAT\nAOPtqmxkwt22G1lBkGUVCOiEuwg1+9AgiMhDHt6Gg8wHjKoQiHv4peGDKxcldfTF\nTAH03vx+2mwT61a/RjE1YqHzmlqmTa89SDNDStrG2VikSB0YdDuqSzB6FMcURktJ\nwwyhOKEjJ4c20wZG5xQfiJfOcij2QYPW5vYtQNCnKfspsF7BCP/GXdYATgyajCxp\n4pkNsAZlRyHUx1zPMR1E1+se+l5s18y0V+b+1YBEmAmcEML9Rev+Rbyd+YXmJ+P9\nrDThkvPXxV+4HZgl0mXvTd1CUUnNnd40ZSzFo8hTmr/+j2T7iR3wcxnoyv/d8MOU\nquYsKDLdBr9ng+Cvbf/8lNJJ6dbCQAcEXvRn8FKjq+iP+hHPXXOh/FrMvBJrbD3V\n6F65eyvyLMN74Caxd2B2ru01yLNGARZr8iOH3cdt4byC0lSA51yNePooe6HfgCEA\nsFEvovilr7kFbspDGrP49wh0evtRDPmqfjMLiiaRxOXefOjbh8XqrfNGDTCQzdE=\n=dTZ0\n-----END PGP PUBLIC KEY BLOCK-----\n", -+ "check_gpg": true, -+ "rhsm": false -+ }, - { - "name": "appstream", - "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/appstream/x86_64", -diff --git a/repositories/ol-94.json b/repositories/ol-94.json -index bb06b89..1f1ec87 100644 ---- a/repositories/ol-94.json -+++ b/repositories/ol-94.json -@@ -7,6 +7,13 @@ - "check_gpg": true, - "rhsm": false - }, -+ { -+ "name": "uekr7", -+ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/UEKR7/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", -@@ -23,6 +30,13 @@ - "check_gpg": true, - "rhsm": false - }, -+ { -+ "name": "uekr7", -+ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/UEKR7/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", -diff --git a/vendor/github.com/osbuild/images/pkg/blueprint/customizations.go b/vendor/github.com/osbuild/images/pkg/blueprint/customizations.go -index a3e1938..258b833 100644 ---- a/vendor/github.com/osbuild/images/pkg/blueprint/customizations.go -+++ b/vendor/github.com/osbuild/images/pkg/blueprint/customizations.go -@@ -262,7 +262,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/rhel8/ami.go b/vendor/github.com/osbuild/images/pkg/distro/rhel8/ami.go -index 080f8cc..0fc0f17 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel8/ami.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel8/ami.go -@@ -202,7 +202,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/rhel8/azure.go b/vendor/github.com/osbuild/images/pkg/distro/rhel8/azure.go -index 34d464a..858a90a 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel8/azure.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel8/azure.go -@@ -137,9 +137,9 @@ func azureCommonPackageSet(t *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", -diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel8/bare_metal.go b/vendor/github.com/osbuild/images/pkg/distro/rhel8/bare_metal.go -index 93ea5e8..9dd2a6d 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel8/bare_metal.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel8/bare_metal.go -@@ -128,7 +128,7 @@ func installerPackageSet(t *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/rhel8/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go -index a843936..677229c 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go -@@ -59,7 +59,7 @@ var defaultDistroImageConfig = &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/rhel9/ami.go b/vendor/github.com/osbuild/images/pkg/distro/rhel9/ami.go -index 3ac96af..e0c5fd4 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel9/ami.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel9/ami.go -@@ -164,7 +164,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/rhel9/azure.go b/vendor/github.com/osbuild/images/pkg/distro/rhel9/azure.go -index a5681b9..306c2e2 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel9/azure.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel9/azure.go -@@ -105,9 +105,9 @@ func azureCommonPackageSet(t *imageType) rpmmd.PackageSet { - "efibootmgr", - "gdisk", - "hyperv-daemons", -- "kernel-core", -- "kernel-modules", -- "kernel", -+ "kernel-uek-core", -+ "kernel-uek-modules", -+ "kernel-uek", - "langpacks-en", - "lvm2", - "NetworkManager", -diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel9/bare_metal.go b/vendor/github.com/osbuild/images/pkg/distro/rhel9/bare_metal.go -index 436ba0c..7ddbd15 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel9/bare_metal.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel9/bare_metal.go -@@ -119,7 +119,7 @@ func installerPackageSet(t *imageType) rpmmd.PackageSet { - "iwl5150-firmware", - "iwl6050-firmware", - "iwl7260-firmware", -- "kernel", -+ "kernel-uek", - "less", - "nfs-utils", - "openssh-clients", -@@ -229,7 +229,7 @@ func anacondaPackageSet(t *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/rhel9/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go -index 990b7aa..cbf99ae 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go -@@ -61,7 +61,7 @@ var defaultDistroImageConfig = &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/image/anaconda_live_installer.go b/vendor/github.com/osbuild/images/pkg/image/anaconda_live_installer.go -index d153dd7..a40f458 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, - ) -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 9487915..367c121 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 -@@ -61,7 +61,7 @@ func (img *AnacondaOSTreeInstaller) InstantiateManifest(m *manifest.Manifest, - buildPipeline, - img.Platform, - repos, -- "kernel", -+ "kernel-uek", - img.Product, - img.OSVersion, - ) -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 f7fb3da..3f168fd 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 -@@ -89,7 +89,7 @@ func (img *AnacondaTarInstaller) InstantiateManifest(m *manifest.Manifest, - buildPipeline, - img.Platform, - repos, -- "kernel", -+ "kernel-uek", - img.Product, - img.OSVersion, - ) -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 7da59af..307cf93 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 -@@ -84,7 +84,7 @@ func (img *OSTreeSimplifiedInstaller) InstantiateManifest(m *manifest.Manifest, - buildPipeline, - img.Platform, - repos, -- "kernel", -+ "kernel-uek", - img.Product, - img.OSVersion, - ) --- -2.39.3 - diff --git a/SOURCES/1004-Add-support-for-OCI-hybrid-images.patch b/SOURCES/1004-Add-support-for-OCI-hybrid-images.patch deleted file mode 100644 index adf41e7..0000000 --- a/SOURCES/1004-Add-support-for-OCI-hybrid-images.patch +++ /dev/null @@ -1,461 +0,0 @@ -From b8b8e969d85d9b09063e70b6d87b8165ddae498a Mon Sep 17 00:00:00 2001 -From: Alex Burmashev -Date: Thu, 9 May 2024 14:43:36 +0000 -Subject: [PATCH 4/5] Add support for OCI hybrid images - -Also enabled building aarch64 OCI images. - -Mainly we enable --no-hostonly option for dracut and allow building OCI -images on aarch64. - -JIRA: OLDIS-33593 - -Signed-off-by: Alex Burmashev ---- - .../osbuild/images/pkg/distro/image_config.go | 1 + - .../osbuild/images/pkg/distro/rhel8/distro.go | 4 +- - .../osbuild/images/pkg/distro/rhel8/images.go | 4 + - .../osbuild/images/pkg/distro/rhel8/qcow2.go | 119 ++++++++++++++ - .../osbuild/images/pkg/distro/rhel9/distro.go | 3 +- - .../osbuild/images/pkg/distro/rhel9/images.go | 4 +- - .../osbuild/images/pkg/distro/rhel9/qcow2.go | 149 +++++++++++++++--- - .../osbuild/images/pkg/manifest/os.go | 9 ++ - .../images/pkg/osbuild/dracut_conf_stage.go | 1 + - 9 files changed, 270 insertions(+), 24 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 da62dde..e6f0a0e 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/image_config.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/image_config.go -@@ -66,6 +66,7 @@ type ImageConfig struct { - - Files []*fsnode.File - Directories []*fsnode.Directory -+ Hostonly *bool - } - - // InheritFrom inherits unset values from the provided parent configuration and -diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go -index 677229c..4eb7c0e 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go -@@ -189,9 +189,6 @@ func newDistro(name string, minor int) *distribution { - name: arch.ARCH_S390X.String(), - } - -- ociImgType := qcow2ImgType(rd) -- ociImgType.name = "oci" -- - x86_64.addImageTypes( - &platform.X86{ - BIOS: true, -@@ -280,6 +277,7 @@ func newDistro(name string, minor int) *distribution { - }, - }, - qcow2ImgType(rd), -+ ociImgTypeAarch64, - ) - - aarch64.addImageTypes( -diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel8/images.go b/vendor/github.com/osbuild/images/pkg/distro/rhel8/images.go -index ffc0f4c..791bac9 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel8/images.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel8/images.go -@@ -62,6 +62,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 -diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel8/qcow2.go b/vendor/github.com/osbuild/images/pkg/distro/rhel8/qcow2.go -index ac0ce48..0c70b41 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel8/qcow2.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel8/qcow2.go -@@ -8,6 +8,50 @@ import ( - "github.com/osbuild/images/pkg/subscription" - ) - -+var ( -+ ociImgType = imageType{ -+ name: "oci", -+ filename: "disk.qcow2", -+ mimeType: "application/x-qemu-disk", -+ 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", -+ packageSets: map[string]packageSetFunc{ -+ osPkgsKey: OCIqcow2CommonPackageSet, -+ }, -+ defaultImageConfig: &distro.ImageConfig{ -+ DefaultTarget: common.ToPtr("multi-user.target"), -+ Hostonly: common.ToPtr(true), -+ }, -+ bootable: true, -+ defaultSize: 10 * common.GibiByte, -+ image: diskImage, -+ buildPipelines: []string{"build"}, -+ payloadPipelines: []string{"os", "image", "qcow2"}, -+ exports: []string{"qcow2"}, -+ basePartitionTables: defaultBasePartitionTables, -+ } -+ -+ ociImgTypeAarch64 = imageType{ -+ name: "oci", -+ filename: "disk.qcow2", -+ mimeType: "application/x-qemu-disk", -+ kernelOptions: "ro LANG=en_US.UTF-8 console=ttyAMA0 console=ttyAMA0,115200 rd.luks=0 rd.md=0 rd.dm=0 rd.lvm.vg=ocivolume rd.lvm.lv=ocivolume/root 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 crashkernel=2G-8G:256M,8G-512G:1G,512G-:3G", -+ packageSets: map[string]packageSetFunc{ -+ osPkgsKey: OCIqcow2CommonPackageSet, -+ }, -+ defaultImageConfig: &distro.ImageConfig{ -+ DefaultTarget: common.ToPtr("multi-user.target"), -+ Hostonly: common.ToPtr(true), -+ }, -+ bootable: true, -+ defaultSize: 10 * common.GibiByte, -+ image: diskImage, -+ buildPipelines: []string{"build"}, -+ payloadPipelines: []string{"os", "image", "qcow2"}, -+ exports: []string{"qcow2"}, -+ basePartitionTables: defaultBasePartitionTables, -+ } -+) -+ - func qcow2ImgType(rd distribution) imageType { - it := imageType{ - name: "qcow2", -@@ -149,6 +193,81 @@ func qcow2CommonPackageSet(t *imageType) rpmmd.PackageSet { - return ps - } - -+func OCIqcow2CommonPackageSet(t *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", -+ }, -+ 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 openstackCommonPackageSet(t *imageType) rpmmd.PackageSet { - return rpmmd.PackageSet{ - Include: []string{ -diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go -index cbf99ae..ac42da2 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go -@@ -193,8 +193,6 @@ func newDistro(name string, minor int) *distribution { - } - - qcow2ImgType := mkQcow2ImgType(rd) -- ociImgType := qcow2ImgType -- ociImgType.name = "oci" - - x86_64.addImageTypes( - &platform.X86{ -@@ -331,6 +329,7 @@ func newDistro(name string, minor int) *distribution { - }, - }, - qcow2ImgType, -+ ociImgTypeAarch64, - ) - aarch64.addImageTypes( - &platform.Aarch64{ -diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel9/images.go b/vendor/github.com/osbuild/images/pkg/distro/rhel9/images.go -index 88e86f8..d267e86 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel9/images.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel9/images.go -@@ -58,7 +58,9 @@ func osCustomizations( - if imageConfig.ExcludeDocs != nil { - 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 -diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel9/qcow2.go b/vendor/github.com/osbuild/images/pkg/distro/rhel9/qcow2.go -index f45e3b5..38432fe 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel9/qcow2.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel9/qcow2.go -@@ -28,6 +28,48 @@ var ( - exports: []string{"qcow2"}, - basePartitionTables: defaultBasePartitionTables, - } -+ -+ ociImgType = imageType{ -+ name: "oci", -+ filename: "disk.qcow2", -+ mimeType: "application/x-qemu-disk", -+ 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", -+ packageSets: map[string]packageSetFunc{ -+ osPkgsKey: OCIqcow2CommonPackageSet, -+ }, -+ defaultImageConfig: &distro.ImageConfig{ -+ DefaultTarget: common.ToPtr("multi-user.target"), -+ Hostonly: common.ToPtr(true), -+ }, -+ bootable: true, -+ defaultSize: 10 * common.GibiByte, -+ image: diskImage, -+ buildPipelines: []string{"build"}, -+ payloadPipelines: []string{"os", "image", "qcow2"}, -+ exports: []string{"qcow2"}, -+ basePartitionTables: defaultBasePartitionTables, -+ } -+ -+ ociImgTypeAarch64 = imageType{ -+ name: "oci", -+ filename: "disk.qcow2", -+ mimeType: "application/x-qemu-disk", -+ kernelOptions: "ro LANG=en_US.UTF-8 console=ttyAMA0 console=ttyAMA0,115200 rd.luks=0 rd.md=0 rd.dm=0 rd.lvm.vg=ocivolume rd.lvm.lv=ocivolume/root 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 crashkernel=2G-8G:256M,8G-512G:1G,512G-:3G", -+ packageSets: map[string]packageSetFunc{ -+ osPkgsKey: OCIqcow2CommonPackageSet, -+ }, -+ defaultImageConfig: &distro.ImageConfig{ -+ DefaultTarget: common.ToPtr("multi-user.target"), -+ Hostonly: common.ToPtr(true), -+ }, -+ bootable: true, -+ defaultSize: 10 * common.GibiByte, -+ image: diskImage, -+ buildPipelines: []string{"build"}, -+ payloadPipelines: []string{"os", "image", "qcow2"}, -+ exports: []string{"qcow2"}, -+ basePartitionTables: defaultBasePartitionTables, -+ } - ) - - func qcow2CommonPackageSet(t *imageType) rpmmd.PackageSet { -@@ -109,6 +151,77 @@ func qcow2CommonPackageSet(t *imageType) rpmmd.PackageSet { - return ps - } - -+func OCIqcow2CommonPackageSet(t *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 openstackCommonPackageSet(t *imageType) rpmmd.PackageSet { - ps := rpmmd.PackageSet{ - Include: []string{ -@@ -154,22 +267,22 @@ func qcowImageConfig(d distribution) *distro.ImageConfig { - } - - func mkQcow2ImgType(d distribution) imageType { -- it := imageType{ -- name: "qcow2", -- filename: "disk.qcow2", -- mimeType: "application/x-qemu-disk", -- kernelOptions: "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0", -- packageSets: map[string]packageSetFunc{ -- osPkgsKey: qcow2CommonPackageSet, -- }, -- bootable: true, -- defaultSize: 10 * common.GibiByte, -- image: diskImage, -- buildPipelines: []string{"build"}, -- payloadPipelines: []string{"os", "image", "qcow2"}, -- exports: []string{"qcow2"}, -- basePartitionTables: defaultBasePartitionTables, -- } -- it.defaultImageConfig = qcowImageConfig(d) -- return it -+ it := imageType{ -+ name: "qcow2", -+ filename: "disk.qcow2", -+ mimeType: "application/x-qemu-disk", -+ kernelOptions: "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0", -+ packageSets: map[string]packageSetFunc{ -+ osPkgsKey: qcow2CommonPackageSet, -+ }, -+ bootable: true, -+ defaultSize: 10 * common.GibiByte, -+ image: diskImage, -+ buildPipelines: []string{"build"}, -+ payloadPipelines: []string{"os", "image", "qcow2"}, -+ exports: []string{"qcow2"}, -+ basePartitionTables: defaultBasePartitionTables, -+ } -+ it.defaultImageConfig = qcowImageConfig(d) -+ return it - } -diff --git a/vendor/github.com/osbuild/images/pkg/manifest/os.go b/vendor/github.com/osbuild/images/pkg/manifest/os.go -index ee44153..fe2694f 100644 ---- a/vendor/github.com/osbuild/images/pkg/manifest/os.go -+++ b/vendor/github.com/osbuild/images/pkg/manifest/os.go -@@ -135,6 +135,7 @@ type OSCustomizations struct { - Files []*fsnode.File - - FIPS bool -+ Hostonly bool - } - - // OS represents the filesystem tree of the target image. This roughly -@@ -595,6 +596,14 @@ func (p *OS) serialize() osbuild.Pipeline { - pipeline.AddStage(osbuild.NewUdevRulesStage(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...) -diff --git a/vendor/github.com/osbuild/images/pkg/osbuild/dracut_conf_stage.go b/vendor/github.com/osbuild/images/pkg/osbuild/dracut_conf_stage.go -index 216c8aa..d9b9841 100644 ---- a/vendor/github.com/osbuild/images/pkg/osbuild/dracut_conf_stage.go -+++ b/vendor/github.com/osbuild/images/pkg/osbuild/dracut_conf_stage.go -@@ -53,6 +53,7 @@ type DracutConfigFile struct { - - // Create reproducible images - Reproducible *bool `json:"reproducible,omitempty"` -+ - } - - // Unexported alias for use in DracutConfigFile MarshalJSON() to prevent recursion --- -2.39.3 - diff --git a/SOURCES/1005-Add-autorelabel-on-first-boot-for-qcow-oci-images.patch b/SOURCES/1005-Add-autorelabel-on-first-boot-for-qcow-oci-images.patch deleted file mode 100644 index 9b95a69..0000000 --- a/SOURCES/1005-Add-autorelabel-on-first-boot-for-qcow-oci-images.patch +++ /dev/null @@ -1,80 +0,0 @@ -From bf29324c4d7cd4c5d5930f41d50160c15d926652 Mon Sep 17 00:00:00 2001 -From: Josue David Hernandez Gutierrez -Date: Fri, 10 May 2024 23:20:50 +0000 -Subject: [PATCH 5/5] Add autorelabel on first boot for qcow oci images - -Signed-off-by: Josue David Hernandez Gutierrez ---- - vendor/github.com/osbuild/images/pkg/distro/rhel8/images.go | 1 + - vendor/github.com/osbuild/images/pkg/distro/rhel8/qcow2.go | 2 ++ - vendor/github.com/osbuild/images/pkg/distro/rhel9/images.go | 1 + - vendor/github.com/osbuild/images/pkg/distro/rhel9/qcow2.go | 2 ++ - 4 files changed, 6 insertions(+) - -diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel8/images.go b/vendor/github.com/osbuild/images/pkg/distro/rhel8/images.go -index 791bac9..0508ab0 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel8/images.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel8/images.go -@@ -138,6 +138,7 @@ func osCustomizations( - // Relabel the tree, unless the `NoSElinux` flag is explicitly set to `true` - if imageConfig.NoSElinux == nil || imageConfig.NoSElinux != nil && !*imageConfig.NoSElinux { - osc.SElinux = "targeted" -+ osc.SELinuxForceRelabel = imageConfig.SELinuxForceRelabel - } - - if t.arch.distro.isRHEL() && options.Facts != nil { -diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel8/qcow2.go b/vendor/github.com/osbuild/images/pkg/distro/rhel8/qcow2.go -index 0c70b41..44e2596 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel8/qcow2.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel8/qcow2.go -@@ -20,6 +20,7 @@ var ( - defaultImageConfig: &distro.ImageConfig{ - DefaultTarget: common.ToPtr("multi-user.target"), - Hostonly: common.ToPtr(true), -+ SELinuxForceRelabel: common.ToPtr(true), - }, - bootable: true, - defaultSize: 10 * common.GibiByte, -@@ -41,6 +42,7 @@ var ( - defaultImageConfig: &distro.ImageConfig{ - DefaultTarget: common.ToPtr("multi-user.target"), - Hostonly: common.ToPtr(true), -+ SELinuxForceRelabel: common.ToPtr(true), - }, - bootable: true, - defaultSize: 10 * common.GibiByte, -diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel9/images.go b/vendor/github.com/osbuild/images/pkg/distro/rhel9/images.go -index d267e86..8b1f0cb 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel9/images.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel9/images.go -@@ -133,6 +133,7 @@ func osCustomizations( - // Relabel the tree, unless the `NoSElinux` flag is explicitly set to `true` - if imageConfig.NoSElinux == nil || imageConfig.NoSElinux != nil && !*imageConfig.NoSElinux { - osc.SElinux = "targeted" -+ osc.SELinuxForceRelabel = imageConfig.SELinuxForceRelabel - } - - if t.arch.distro.isRHEL() && options.Facts != nil { -diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel9/qcow2.go b/vendor/github.com/osbuild/images/pkg/distro/rhel9/qcow2.go -index 38432fe..f39c27d 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel9/qcow2.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel9/qcow2.go -@@ -40,6 +40,7 @@ var ( - defaultImageConfig: &distro.ImageConfig{ - DefaultTarget: common.ToPtr("multi-user.target"), - Hostonly: common.ToPtr(true), -+ SELinuxForceRelabel: common.ToPtr(true), - }, - bootable: true, - defaultSize: 10 * common.GibiByte, -@@ -61,6 +62,7 @@ var ( - defaultImageConfig: &distro.ImageConfig{ - DefaultTarget: common.ToPtr("multi-user.target"), - Hostonly: common.ToPtr(true), -+ SELinuxForceRelabel: common.ToPtr(true), - }, - bootable: true, - defaultSize: 10 * common.GibiByte, --- -2.39.3 - diff --git a/SOURCES/1006-Update-cmdline-parameters-for-OCI-images.patch b/SOURCES/1006-Update-cmdline-parameters-for-OCI-images.patch deleted file mode 100644 index ee9c3ce..0000000 --- a/SOURCES/1006-Update-cmdline-parameters-for-OCI-images.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 43e19869fe30b4d9ed1f127a2a9b6800e3dc9b64 Mon Sep 17 00:00:00 2001 -From: Alex Burmashev -Date: Mon, 3 Jun 2024 13:18:43 +0000 -Subject: [PATCH] Update cmdline parameters for OCI images - -Signed-off-by: Alex Burmashev ---- - vendor/github.com/osbuild/images/pkg/distro/rhel8/qcow2.go | 2 +- - vendor/github.com/osbuild/images/pkg/distro/rhel9/qcow2.go | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel8/qcow2.go b/vendor/github.com/osbuild/images/pkg/distro/rhel8/qcow2.go -index 44e2596..147325b 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel8/qcow2.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel8/qcow2.go -@@ -35,7 +35,7 @@ var ( - name: "oci", - filename: "disk.qcow2", - mimeType: "application/x-qemu-disk", -- kernelOptions: "ro LANG=en_US.UTF-8 console=ttyAMA0 console=ttyAMA0,115200 rd.luks=0 rd.md=0 rd.dm=0 rd.lvm.vg=ocivolume rd.lvm.lv=ocivolume/root 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 crashkernel=2G-8G:256M,8G-512G:1G,512G-:3G", -+ 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", - packageSets: map[string]packageSetFunc{ - osPkgsKey: OCIqcow2CommonPackageSet, - }, -diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel9/qcow2.go b/vendor/github.com/osbuild/images/pkg/distro/rhel9/qcow2.go -index f39c27d..974dc04 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel9/qcow2.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel9/qcow2.go -@@ -55,7 +55,7 @@ var ( - name: "oci", - filename: "disk.qcow2", - mimeType: "application/x-qemu-disk", -- kernelOptions: "ro LANG=en_US.UTF-8 console=ttyAMA0 console=ttyAMA0,115200 rd.luks=0 rd.md=0 rd.dm=0 rd.lvm.vg=ocivolume rd.lvm.lv=ocivolume/root 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 crashkernel=2G-8G:256M,8G-512G:1G,512G-:3G", -+ kernelOptions: "ro LANG=en_US.UTF-8 console=ttyAMA0 console=ttyAMA0,115200 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 crashkernel=2G-8G:256M,8G-512G:1G,512G-:3G", - packageSets: map[string]packageSetFunc{ - osPkgsKey: OCIqcow2CommonPackageSet, - }, --- -2.39.3 - diff --git a/SOURCES/1007-remove-GCP-build-option.patch b/SOURCES/1007-remove-GCP-build-option.patch deleted file mode 100644 index 76ef77d..0000000 --- a/SOURCES/1007-remove-GCP-build-option.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 16d86cfec1a0e56d96e4c4684e8fd5a943178c88 Mon Sep 17 00:00:00 2001 -From: Josue David Hernandez Gutierrez -Date: Tue, 4 Jun 2024 23:54:00 +0000 -Subject: [PATCH] remove GCP build option - -Signed-off-by: Josue David Hernandez Gutierrez ---- - internal/cloudapi/v2/compose_test.go | 12 ------------ - .../osbuild/images/pkg/distro/rhel8/distro.go | 15 --------------- - .../osbuild/images/pkg/distro/rhel9/distro.go | 13 ------------- - 3 files changed, 40 deletions(-) - -diff --git a/internal/cloudapi/v2/compose_test.go b/internal/cloudapi/v2/compose_test.go -index a966ced..8874553 100644 ---- a/internal/cloudapi/v2/compose_test.go -+++ b/internal/cloudapi/v2/compose_test.go -@@ -529,18 +529,6 @@ func TestGetImageRequests_ImageTypeConversion(t *testing.T) { - expectedImageType: "azure-sap-rhui", - expectedTargetName: target.TargetNameAzureImage, - }, -- { -- requestedImageType: ImageTypesGcp, -- requestedDistros: []string{rhel8, centos8, rhel9, centos9}, -- expectedImageType: "gce", -- expectedTargetName: target.TargetNameGCP, -- }, -- { -- requestedImageType: ImageTypesGcpRhui, -- requestedDistros: []string{rhel8, rhel9}, -- expectedImageType: "gce-rhui", -- expectedTargetName: target.TargetNameGCP, -- }, - { - requestedImageType: ImageTypesGuestImage, - requestedDistros: []string{fedora, rhel8, centos8, rhel9, centos9}, -diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go -index 4eb7c0e..63114f9 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go -@@ -239,18 +239,6 @@ func newDistro(name string, minor int) *distribution { - imageInstaller(), - ) - -- gceX86Platform := &platform.X86{ -- UEFIVendor: rd.vendor, -- BasePlatform: platform.BasePlatform{ -- ImageFormat: platform.FORMAT_GCE, -- }, -- } -- -- x86_64.addImageTypes( -- gceX86Platform, -- gceImgType(rd), -- ) -- - x86_64.addImageTypes( - &platform.X86{ - BIOS: true, -@@ -404,9 +392,6 @@ func newDistro(name string, minor int) *distribution { - x86_64.addImageTypes(ec2X86Platform, ec2SapImgTypeX86_64(rd)) - } - -- // add GCE RHUI image to RHEL only -- x86_64.addImageTypes(gceX86Platform, gceRhuiImgType(rd)) -- - // add s390x to RHEL distro only - rd.addArches(s390x) - } else { -diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go -index d1c2c84..97ec103 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go -@@ -245,17 +245,6 @@ func newDistro(name string, minor int) *distribution { - mkAMIImgTypeX86_64(), - ) - -- gceX86Platform := &platform.X86{ -- UEFIVendor: rd.vendor, -- BasePlatform: platform.BasePlatform{ -- ImageFormat: platform.FORMAT_GCE, -- }, -- } -- x86_64.addImageTypes( -- gceX86Platform, -- mkGCEImageType(), -- ) -- - x86_64.addImageTypes( - &platform.X86{ - BasePlatform: platform.BasePlatform{ -@@ -401,8 +390,6 @@ func newDistro(name string, minor int) *distribution { - mkEC2ImgTypeAarch64(rd.osVersion, rd.isRHEL()), - ) - -- // add GCE RHUI image to RHEL only -- x86_64.addImageTypes(gceX86Platform, mkGCERHUIImageType()) - } else { - x86_64.addImageTypes(azureX64Platform, azureImgType) - aarch64.addImageTypes(azureAarch64Platform, azureImgType) --- -2.43.0 - diff --git a/SOURCES/1008-remove-vmware-ova-image-from-build-options.patch b/SOURCES/1008-remove-vmware-ova-image-from-build-options.patch deleted file mode 100644 index d842cfa..0000000 --- a/SOURCES/1008-remove-vmware-ova-image-from-build-options.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 8ba2746a79f2ad86d371e1bdd481eb2d0469b927 Mon Sep 17 00:00:00 2001 -From: Josue David Hernandez Gutierrez -Date: Wed, 5 Jun 2024 15:33:36 +0000 -Subject: [PATCH] remove vmware (ova) image from build options - -Signed-off-by: Josue David Hernandez Gutierrez ---- - internal/cloudapi/v2/compose_test.go | 6 ------ - .../osbuild/images/pkg/distro/rhel8/distro.go | 11 ----------- - .../osbuild/images/pkg/distro/rhel9/distro.go | 11 ----------- - 3 files changed, 28 deletions(-) - -diff --git a/internal/cloudapi/v2/compose_test.go b/internal/cloudapi/v2/compose_test.go -index 8874553..edd6ad8 100644 ---- a/internal/cloudapi/v2/compose_test.go -+++ b/internal/cloudapi/v2/compose_test.go -@@ -595,12 +595,6 @@ func TestGetImageRequests_ImageTypeConversion(t *testing.T) { - expectedImageType: "oci", - expectedTargetName: target.TargetNameOCIObjectStorage, - }, -- { -- requestedImageType: ImageTypesVsphereOva, -- requestedDistros: []string{fedora, rhel8, centos8, rhel9, centos9}, -- expectedImageType: "ova", -- expectedTargetName: target.TargetNameAWSS3, -- }, - { - requestedImageType: ImageTypesWsl, - requestedDistros: []string{fedora, rhel8, centos8, rhel9, centos9}, -diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go -index 63114f9..3beca5e 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go -@@ -239,17 +239,6 @@ func newDistro(name string, minor int) *distribution { - imageInstaller(), - ) - -- x86_64.addImageTypes( -- &platform.X86{ -- BIOS: true, -- UEFIVendor: rd.vendor, -- BasePlatform: platform.BasePlatform{ -- ImageFormat: platform.FORMAT_OVA, -- }, -- }, -- ovaImgType(), -- ) -- - x86_64.addImageTypes( - &platform.X86{}, - tarImgType(), -diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go -index 97ec103..44b7e44 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go -@@ -222,17 +222,6 @@ func newDistro(name string, minor int) *distribution { - }, - } - -- x86_64.addImageTypes( -- &platform.X86{ -- BIOS: true, -- UEFIVendor: rd.vendor, -- BasePlatform: platform.BasePlatform{ -- ImageFormat: platform.FORMAT_OVA, -- }, -- }, -- ovaImgType, -- ) -- - ec2X86Platform := &platform.X86{ - BIOS: true, - UEFIVendor: rd.vendor, --- -2.43.0 - diff --git a/SOURCES/1009-Increase-default-boot-size-to-1GB.patch.patch b/SOURCES/1009-Increase-default-boot-size-to-1GB.patch.patch deleted file mode 100644 index bb559d1..0000000 --- a/SOURCES/1009-Increase-default-boot-size-to-1GB.patch.patch +++ /dev/null @@ -1,37 +0,0 @@ -From c6f17987b7d03a43ac19073fdcfa3dd879d0deb2 Mon Sep 17 00:00:00 2001 -From: Alex Burmashev -Date: Thu, 25 Jul 2024 12:02:46 +0000 -Subject: [PATCH] Increase default /boot size to 1GB - -Orabug: 36827079 - -Signed-off-by: Alex Burmashev -Reviewed-by: Laurence Rochfort ---- - vendor/github.com/osbuild/images/pkg/disk/partition_table.go | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/vendor/github.com/osbuild/images/pkg/disk/partition_table.go b/vendor/github.com/osbuild/images/pkg/disk/partition_table.go -index df7154c..d8e61fd 100644 ---- a/vendor/github.com/osbuild/images/pkg/disk/partition_table.go -+++ b/vendor/github.com/osbuild/images/pkg/disk/partition_table.go -@@ -547,7 +547,7 @@ func clampFSSize(mountpoint string, size uint64) uint64 { - var minSize uint64 = 1073741824 - - if mountpoint == "/boot" { -- minSize = 524288000 -+ minSize = 1073741824 - } - - if minSize > size { -@@ -631,7 +631,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*common.MiB) -+ _, err := pt.CreateMountpoint("/boot", 1024*common.MiB) - - if err != nil { - return err --- -2.43.5 diff --git a/SOURCES/1010-Remove-wsl-and-minimal-raw-image-types.patch b/SOURCES/1010-Remove-wsl-and-minimal-raw-image-types.patch deleted file mode 100644 index 3d1e251..0000000 --- a/SOURCES/1010-Remove-wsl-and-minimal-raw-image-types.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 944bb85144ba4aa2fe3e7d92406bf097c80ae511 Mon Sep 17 00:00:00 2001 -From: Josue David Hernandez Gutierrez -Date: Wed, 21 Aug 2024 22:22:49 +0000 -Subject: [PATCH] Remove wsl and minimal-raw image types - -Signed-off-by: Josue David Hernandez Gutierrez ---- - internal/cloudapi/v2/compose_test.go | 12 ------------ - .../osbuild/images/pkg/distro/rhel8/distro.go | 4 ---- - .../osbuild/images/pkg/distro/rhel9/distro.go | 4 ---- - 3 files changed, 20 deletions(-) - -diff --git a/internal/cloudapi/v2/compose_test.go b/internal/cloudapi/v2/compose_test.go -index edd6ad8..e82d6fd 100644 ---- a/internal/cloudapi/v2/compose_test.go -+++ b/internal/cloudapi/v2/compose_test.go -@@ -583,24 +583,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: ImageTypesWsl, -- requestedDistros: []string{fedora, rhel8, centos8, rhel9, centos9}, -- expectedImageType: "wsl", -- expectedTargetName: target.TargetNameAWSS3, -- }, - } - for _, tt := range tests { - t.Run(string(tt.requestedImageType), func(t *testing.T) { -diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go -index 3beca5e..baf472b 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel8/distro.go -@@ -242,7 +242,6 @@ func newDistro(name string, minor int) *distribution { - x86_64.addImageTypes( - &platform.X86{}, - tarImgType(), -- wslImgType(), - ) - - aarch64.addImageTypes( -@@ -260,7 +259,6 @@ func newDistro(name string, minor int) *distribution { - aarch64.addImageTypes( - &platform.Aarch64{}, - tarImgType(), -- wslImgType(), - ) - - bareMetalAarch64Platform := &platform.Aarch64{ -@@ -283,7 +281,6 @@ func newDistro(name string, minor int) *distribution { - aarch64.addImageTypes( - rawAarch64Platform, - amiImgTypeAarch64(rd), -- minimalRawImgType(rd), - ) - - ppc64le.addImageTypes( -@@ -343,7 +340,6 @@ func newDistro(name string, minor int) *distribution { - - x86_64.addImageTypes( - rawUEFIx86Platform, -- minimalRawImgType(rd), - ) - - if rd.isRHEL() { -diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go -index 44b7e44..498b417 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel9/distro.go -@@ -265,19 +265,16 @@ func newDistro(name string, minor int) *distribution { - BIOS: false, - UEFIVendor: rd.vendor, - }, -- minimalrawImgType, - ) - - x86_64.addImageTypes( - &platform.X86{}, - tarImgType, -- wslImgType, - ) - - aarch64.addImageTypes( - &platform.Aarch64{}, - tarImgType, -- wslImgType, - ) - - aarch64.addImageTypes( -@@ -295,7 +292,6 @@ func newDistro(name string, minor int) *distribution { - }, - UEFIVendor: rd.vendor, - }, -- minimalrawImgType, - ) - - aarch64.addImageTypes( --- -2.43.5 - diff --git a/SOURCES/1011-Support-using-repository-definitions-with-OCI-variab.patch b/SOURCES/1011-Support-using-repository-definitions-with-OCI-variab.patch deleted file mode 100644 index fc32fcf..0000000 --- a/SOURCES/1011-Support-using-repository-definitions-with-OCI-variab.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 7d51298e338bffe84bfd8c178a337bfb4ff58701 Mon Sep 17 00:00:00 2001 -From: Alex Burmashev -Date: Fri, 19 Jul 2024 13:26:03 +0000 -Subject: [PATCH] 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 ---- - .../osbuild/images/pkg/rpmmd/repository.go | 44 +++++++++++++++++-- - 1 file changed, 41 insertions(+), 3 deletions(-) - -diff --git a/vendor/github.com/osbuild/images/pkg/rpmmd/repository.go b/vendor/github.com/osbuild/images/pkg/rpmmd/repository.go -index 64591a2..b19ad98 100644 ---- a/vendor/github.com/osbuild/images/pkg/rpmmd/repository.go -+++ b/vendor/github.com/osbuild/images/pkg/rpmmd/repository.go -@@ -8,7 +8,8 @@ import ( - "sort" - "strings" - "time" -- -+ "bufio" -+ "bytes" - "github.com/gobwas/glob" - ) - -@@ -221,12 +222,48 @@ func LoadRepositoriesFromFile(filename string) (map[string][]RepoConfig, error) - return nil, err - } - defer f.Close() -+ var ocidomain, ociregion, region []byte -+ -+ 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(f) -+ 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") - var reposMap map[string][]repository - repoConfigs := make(map[string][]RepoConfig) -- -- err = json.NewDecoder(f).Decode(&reposMap) -+ 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 - } - -@@ -234,6 +271,7 @@ func LoadRepositoriesFromFile(filename string) (map[string][]RepoConfig, error) - for idx := range repos { - repo := repos[idx] - var urls []string -+ - if repo.BaseURL != "" { - urls = []string{repo.BaseURL} - } --- -2.43.5 - diff --git a/SOURCES/1012-Update-Oracle-repositories-to-contain-OCI-variables.patch b/SOURCES/1012-Update-Oracle-repositories-to-contain-OCI-variables.patch deleted file mode 100644 index ec91863..0000000 --- a/SOURCES/1012-Update-Oracle-repositories-to-contain-OCI-variables.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 28d790dbadccdf93bd41d0c18735d30184adbc2c Mon Sep 17 00:00:00 2001 -From: Alex Burmashev -Date: Mon, 22 Jul 2024 16:17:32 +0000 -Subject: [PATCH] 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 ---- - repositories/ol-810.json | 12 ++++++------ - repositories/ol-94.json | 12 ++++++------ - 2 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/repositories/ol-810.json b/repositories/ol-810.json -index 1332c79..b9b1f5a 100644 ---- a/repositories/ol-810.json -+++ b/repositories/ol-810.json -@@ -2,21 +2,21 @@ - "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", - "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\nVersion: GnuPG v2.0.14 (GNU/Linux)\n\n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\n=dTZ0\n-----END PGP PUBLIC KEY BLOCK-----\n", - "check_gpg": true, - "rhsm": false - }, - { - "name": "uekr7", -- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/UEKR7/aarch64/", -+ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/UEKR7/aarch64/", - "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\nVersion: GnuPG v2.0.14 (GNU/Linux)\n\n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\n=dTZ0\n-----END PGP PUBLIC KEY BLOCK-----\n", - "check_gpg": true, - "rhsm": false - }, - { - "name": "appstream", -- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/appstream/aarch64", -+ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/appstream/aarch64", - "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\nVersion: GnuPG v2.0.14 (GNU/Linux)\n\n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\n=dTZ0\n-----END PGP PUBLIC KEY BLOCK-----\n", - "check_gpg": true, - "rhsm": false -@@ -25,21 +25,21 @@ - "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", - "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\nVersion: GnuPG v2.0.14 (GNU/Linux)\n\n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\n=dTZ0\n-----END PGP PUBLIC KEY BLOCK-----\n", - "check_gpg": true, - "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/", - "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\nVersion: GnuPG v2.0.14 (GNU/Linux)\n\n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\n=dTZ0\n-----END PGP PUBLIC KEY BLOCK-----\n", - "check_gpg": true, - "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", - "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\nVersion: GnuPG v2.0.14 (GNU/Linux)\n\n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\n=dTZ0\n-----END PGP PUBLIC KEY BLOCK-----\n", - "check_gpg": true, - "rhsm": false -diff --git a/repositories/ol-94.json b/repositories/ol-94.json -index 1f1ec87..8d3a20b 100644 ---- a/repositories/ol-94.json -+++ b/repositories/ol-94.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": "uekr7", -- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/UEKR7/aarch64/", -+ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/UEKR7/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": "uekr7", -- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/UEKR7/x86_64/", -+ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/UEKR7/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/CVE-2025-30204.patch b/SOURCES/CVE-2025-30204.patch deleted file mode 100644 index b76cbda..0000000 --- a/SOURCES/CVE-2025-30204.patch +++ /dev/null @@ -1,391 +0,0 @@ -diff --git a/go.mod b/go.mod -index f571516..d3d329f 100644 ---- a/go.mod -+++ b/go.mod -@@ -23,7 +23,7 @@ require ( - github.com/getkin/kin-openapi v0.93.0 - github.com/getsentry/sentry-go v0.26.0 - github.com/gobwas/glob v0.2.3 -- github.com/golang-jwt/jwt/v4 v4.5.0 -+ github.com/golang-jwt/jwt/v4 v4.5.2 - github.com/google/go-cmp v0.6.0 - github.com/google/uuid v1.6.0 - github.com/gophercloud/gophercloud v1.9.0 -@@ -114,7 +114,7 @@ require ( - github.com/go-openapi/validate v0.22.1 // indirect - github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang-jwt/jwt v3.2.2+incompatible // indirect -- github.com/golang-jwt/jwt/v5 v5.2.0 // indirect -+ github.com/golang-jwt/jwt/v5 v5.2.2 // indirect - github.com/golang/glog v1.1.2 // indirect - github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/protobuf v1.5.3 // indirect -diff --git a/go.sum b/go.sum -index 5996751..488870b 100644 ---- a/go.sum -+++ b/go.sum -@@ -251,10 +251,11 @@ github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keL - github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= - github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= - github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= --github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= - github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= --github.com/golang-jwt/jwt/v5 v5.2.0 h1:d/ix8ftRUorsN+5eMIlF4T6J8CAt9rch3My2winC1Jw= --github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= -+github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI= -+github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= -+github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8= -+github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= - github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= - github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo= - github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= -diff --git a/vendor/github.com/golang-jwt/jwt/v4/parser.go b/vendor/github.com/golang-jwt/jwt/v4/parser.go -index c0a6f69..0fc510a 100644 ---- a/vendor/github.com/golang-jwt/jwt/v4/parser.go -+++ b/vendor/github.com/golang-jwt/jwt/v4/parser.go -@@ -7,6 +7,8 @@ import ( - "strings" - ) - -+const tokenDelimiter = "." -+ - type Parser struct { - // If populated, only these methods will be considered valid. - // -@@ -36,19 +38,21 @@ func NewParser(options ...ParserOption) *Parser { - return p - } - --// Parse parses, validates, verifies the signature and returns the parsed token. --// keyFunc will receive the parsed token and should return the key for validating. -+// Parse parses, validates, verifies the signature and returns the parsed token. keyFunc will -+// receive the parsed token and should return the key for validating. - func (p *Parser) Parse(tokenString string, keyFunc Keyfunc) (*Token, error) { - return p.ParseWithClaims(tokenString, MapClaims{}, keyFunc) - } - --// ParseWithClaims parses, validates, and verifies like Parse, but supplies a default object implementing the Claims --// interface. This provides default values which can be overridden and allows a caller to use their own type, rather --// than the default MapClaims implementation of Claims. -+// ParseWithClaims parses, validates, and verifies like Parse, but supplies a default object -+// implementing the Claims interface. This provides default values which can be overridden and -+// allows a caller to use their own type, rather than the default MapClaims implementation of -+// Claims. - // --// Note: If you provide a custom claim implementation that embeds one of the standard claims (such as RegisteredClaims), --// make sure that a) you either embed a non-pointer version of the claims or b) if you are using a pointer, allocate the --// proper memory for it before passing in the overall claims, otherwise you might run into a panic. -+// Note: If you provide a custom claim implementation that embeds one of the standard claims (such -+// as RegisteredClaims), make sure that a) you either embed a non-pointer version of the claims or -+// b) if you are using a pointer, allocate the proper memory for it before passing in the overall -+// claims, otherwise you might run into a panic. - func (p *Parser) ParseWithClaims(tokenString string, claims Claims, keyFunc Keyfunc) (*Token, error) { - token, parts, err := p.ParseUnverified(tokenString, claims) - if err != nil { -@@ -85,12 +89,17 @@ func (p *Parser) ParseWithClaims(tokenString string, claims Claims, keyFunc Keyf - return token, &ValidationError{Inner: err, Errors: ValidationErrorUnverifiable} - } - -+ // Perform validation -+ token.Signature = parts[2] -+ if err := token.Method.Verify(strings.Join(parts[0:2], "."), token.Signature, key); err != nil { -+ return token, &ValidationError{Inner: err, Errors: ValidationErrorSignatureInvalid} -+ } -+ - vErr := &ValidationError{} - - // Validate Claims - if !p.SkipClaimsValidation { - if err := token.Claims.Valid(); err != nil { -- - // If the Claims Valid returned an error, check if it is a validation error, - // If it was another error type, create a ValidationError with a generic ClaimsInvalid flag set - if e, ok := err.(*ValidationError); !ok { -@@ -98,22 +107,14 @@ func (p *Parser) ParseWithClaims(tokenString string, claims Claims, keyFunc Keyf - } else { - vErr = e - } -+ return token, vErr - } - } - -- // Perform validation -- token.Signature = parts[2] -- if err = token.Method.Verify(strings.Join(parts[0:2], "."), token.Signature, key); err != nil { -- vErr.Inner = err -- vErr.Errors |= ValidationErrorSignatureInvalid -- } -- -- if vErr.valid() { -- token.Valid = true -- return token, nil -- } -+ // No errors so far, token is valid. -+ token.Valid = true - -- return token, vErr -+ return token, nil - } - - // ParseUnverified parses the token but doesn't validate the signature. -@@ -123,9 +124,10 @@ func (p *Parser) ParseWithClaims(tokenString string, claims Claims, keyFunc Keyf - // It's only ever useful in cases where you know the signature is valid (because it has - // been checked previously in the stack) and you want to extract values from it. - func (p *Parser) ParseUnverified(tokenString string, claims Claims) (token *Token, parts []string, err error) { -- parts = strings.Split(tokenString, ".") -- if len(parts) != 3 { -- return nil, parts, NewValidationError("token contains an invalid number of segments", ValidationErrorMalformed) -+ var ok bool -+ parts, ok = splitToken(tokenString) -+ if !ok { -+ return nil, nil, NewValidationError("token contains an invalid number of segments", ValidationErrorMalformed) - } - - token = &Token{Raw: tokenString} -@@ -175,3 +177,30 @@ func (p *Parser) ParseUnverified(tokenString string, claims Claims) (token *Toke - - return token, parts, nil - } -+ -+// splitToken splits a token string into three parts: header, claims, and signature. It will only -+// return true if the token contains exactly two delimiters and three parts. In all other cases, it -+// will return nil parts and false. -+func splitToken(token string) ([]string, bool) { -+ parts := make([]string, 3) -+ header, remain, ok := strings.Cut(token, tokenDelimiter) -+ if !ok { -+ return nil, false -+ } -+ parts[0] = header -+ claims, remain, ok := strings.Cut(remain, tokenDelimiter) -+ if !ok { -+ return nil, false -+ } -+ parts[1] = claims -+ // One more cut to ensure the signature is the last part of the token and there are no more -+ // delimiters. This avoids an issue where malicious input could contain additional delimiters -+ // causing unecessary overhead parsing tokens. -+ signature, _, unexpected := strings.Cut(remain, tokenDelimiter) -+ if unexpected { -+ return nil, false -+ } -+ parts[2] = signature -+ -+ return parts, true -+} -diff --git a/vendor/github.com/golang-jwt/jwt/v5/README.md b/vendor/github.com/golang-jwt/jwt/v5/README.md -index 964598a..0bb636f 100644 ---- a/vendor/github.com/golang-jwt/jwt/v5/README.md -+++ b/vendor/github.com/golang-jwt/jwt/v5/README.md -@@ -10,11 +10,11 @@ implementation of [JSON Web - Tokens](https://datatracker.ietf.org/doc/html/rfc7519). - - Starting with [v4.0.0](https://github.com/golang-jwt/jwt/releases/tag/v4.0.0) --this project adds Go module support, but maintains backwards compatibility with -+this project adds Go module support, but maintains backward compatibility with - older `v3.x.y` tags and upstream `github.com/dgrijalva/jwt-go`. See the - [`MIGRATION_GUIDE.md`](./MIGRATION_GUIDE.md) for more information. Version - v5.0.0 introduces major improvements to the validation of tokens, but is not --entirely backwards compatible. -+entirely backward compatible. - - > After the original author of the library suggested migrating the maintenance - > of `jwt-go`, a dedicated team of open source maintainers decided to clone the -@@ -24,7 +24,7 @@ entirely backwards compatible. - - - **SECURITY NOTICE:** Some older versions of Go have a security issue in the --crypto/elliptic. Recommendation is to upgrade to at least 1.15 See issue -+crypto/elliptic. The recommendation is to upgrade to at least 1.15 See issue - [dgrijalva/jwt-go#216](https://github.com/dgrijalva/jwt-go/issues/216) for more - detail. - -@@ -32,7 +32,7 @@ detail. - what you - expect](https://auth0.com/blog/critical-vulnerabilities-in-json-web-token-libraries/). - This library attempts to make it easy to do the right thing by requiring key --types match the expected alg, but you should take the extra step to verify it in -+types to match the expected alg, but you should take the extra step to verify it in - your usage. See the examples provided. - - ### Supported Go versions -@@ -41,7 +41,7 @@ Our support of Go versions is aligned with Go's [version release - policy](https://golang.org/doc/devel/release#policy). So we will support a major - version of Go until there are two newer major releases. We no longer support - building jwt-go with unsupported Go versions, as these contain security --vulnerabilities which will not be fixed. -+vulnerabilities that will not be fixed. - - ## What the heck is a JWT? - -@@ -117,7 +117,7 @@ notable differences: - - This library is considered production ready. Feedback and feature requests are - appreciated. The API should be considered stable. There should be very few --backwards-incompatible changes outside of major version updates (and only with -+backward-incompatible changes outside of major version updates (and only with - good reason). - - This project uses [Semantic Versioning 2.0.0](http://semver.org). Accepted pull -@@ -125,8 +125,8 @@ requests will land on `main`. Periodically, versions will be tagged from - `main`. You can find all the releases on [the project releases - page](https://github.com/golang-jwt/jwt/releases). - --**BREAKING CHANGES:*** A full list of breaking changes is available in --`VERSION_HISTORY.md`. See `MIGRATION_GUIDE.md` for more information on updating -+**BREAKING CHANGES:** A full list of breaking changes is available in -+`VERSION_HISTORY.md`. See [`MIGRATION_GUIDE.md`](./MIGRATION_GUIDE.md) for more information on updating - your code. - - ## Extensions -diff --git a/vendor/github.com/golang-jwt/jwt/v5/SECURITY.md b/vendor/github.com/golang-jwt/jwt/v5/SECURITY.md -index b08402c..2740597 100644 ---- a/vendor/github.com/golang-jwt/jwt/v5/SECURITY.md -+++ b/vendor/github.com/golang-jwt/jwt/v5/SECURITY.md -@@ -2,11 +2,11 @@ - - ## Supported Versions - --As of February 2022 (and until this document is updated), the latest version `v4` is supported. -+As of November 2024 (and until this document is updated), the latest version `v5` is supported. In critical cases, we might supply back-ported patches for `v4`. - - ## Reporting a Vulnerability - --If you think you found a vulnerability, and even if you are not sure, please report it to jwt-go-security@googlegroups.com or one of the other [golang-jwt maintainers](https://github.com/orgs/golang-jwt/people). Please try be explicit, describe steps to reproduce the security issue with code example(s). -+If you think you found a vulnerability, and even if you are not sure, please report it a [GitHub Security Advisory](https://github.com/golang-jwt/jwt/security/advisories/new). Please try be explicit, describe steps to reproduce the security issue with code example(s). - - You will receive a response within a timely manner. If the issue is confirmed, we will do our best to release a patch as soon as possible given the complexity of the problem. - -diff --git a/vendor/github.com/golang-jwt/jwt/v5/ecdsa.go b/vendor/github.com/golang-jwt/jwt/v5/ecdsa.go -index ca85659..c929e4a 100644 ---- a/vendor/github.com/golang-jwt/jwt/v5/ecdsa.go -+++ b/vendor/github.com/golang-jwt/jwt/v5/ecdsa.go -@@ -62,7 +62,7 @@ func (m *SigningMethodECDSA) Verify(signingString string, sig []byte, key interf - case *ecdsa.PublicKey: - ecdsaKey = k - default: -- return newError("ECDSA verify expects *ecsda.PublicKey", ErrInvalidKeyType) -+ return newError("ECDSA verify expects *ecdsa.PublicKey", ErrInvalidKeyType) - } - - if len(sig) != 2*m.KeySize { -@@ -96,7 +96,7 @@ func (m *SigningMethodECDSA) Sign(signingString string, key interface{}) ([]byte - case *ecdsa.PrivateKey: - ecdsaKey = k - default: -- return nil, newError("ECDSA sign expects *ecsda.PrivateKey", ErrInvalidKeyType) -+ return nil, newError("ECDSA sign expects *ecdsa.PrivateKey", ErrInvalidKeyType) - } - - // Create the hasher -diff --git a/vendor/github.com/golang-jwt/jwt/v5/hmac.go b/vendor/github.com/golang-jwt/jwt/v5/hmac.go -index 96c6272..aca600c 100644 ---- a/vendor/github.com/golang-jwt/jwt/v5/hmac.go -+++ b/vendor/github.com/golang-jwt/jwt/v5/hmac.go -@@ -91,7 +91,7 @@ func (m *SigningMethodHMAC) Verify(signingString string, sig []byte, key interfa - func (m *SigningMethodHMAC) Sign(signingString string, key interface{}) ([]byte, error) { - if keyBytes, ok := key.([]byte); ok { - if !m.Hash.Available() { -- return nil, newError("HMAC sign expects []byte", ErrInvalidKeyType) -+ return nil, ErrHashUnavailable - } - - hasher := hmac.New(m.Hash.New, keyBytes) -@@ -100,5 +100,5 @@ func (m *SigningMethodHMAC) Sign(signingString string, key interface{}) ([]byte, - return hasher.Sum(nil), nil - } - -- return nil, ErrInvalidKeyType -+ return nil, newError("HMAC sign expects []byte", ErrInvalidKeyType) - } -diff --git a/vendor/github.com/golang-jwt/jwt/v5/parser.go b/vendor/github.com/golang-jwt/jwt/v5/parser.go -index ecf99af..054c7eb 100644 ---- a/vendor/github.com/golang-jwt/jwt/v5/parser.go -+++ b/vendor/github.com/golang-jwt/jwt/v5/parser.go -@@ -8,6 +8,8 @@ import ( - "strings" - ) - -+const tokenDelimiter = "." -+ - type Parser struct { - // If populated, only these methods will be considered valid. - validMethods []string -@@ -136,9 +138,10 @@ func (p *Parser) ParseWithClaims(tokenString string, claims Claims, keyFunc Keyf - // It's only ever useful in cases where you know the signature is valid (since it has already - // been or will be checked elsewhere in the stack) and you want to extract values from it. - func (p *Parser) ParseUnverified(tokenString string, claims Claims) (token *Token, parts []string, err error) { -- parts = strings.Split(tokenString, ".") -- if len(parts) != 3 { -- return nil, parts, newError("token contains an invalid number of segments", ErrTokenMalformed) -+ var ok bool -+ parts, ok = splitToken(tokenString) -+ if !ok { -+ return nil, nil, newError("token contains an invalid number of segments", ErrTokenMalformed) - } - - token = &Token{Raw: tokenString} -@@ -196,6 +199,33 @@ func (p *Parser) ParseUnverified(tokenString string, claims Claims) (token *Toke - return token, parts, nil - } - -+// splitToken splits a token string into three parts: header, claims, and signature. It will only -+// return true if the token contains exactly two delimiters and three parts. In all other cases, it -+// will return nil parts and false. -+func splitToken(token string) ([]string, bool) { -+ parts := make([]string, 3) -+ header, remain, ok := strings.Cut(token, tokenDelimiter) -+ if !ok { -+ return nil, false -+ } -+ parts[0] = header -+ claims, remain, ok := strings.Cut(remain, tokenDelimiter) -+ if !ok { -+ return nil, false -+ } -+ parts[1] = claims -+ // One more cut to ensure the signature is the last part of the token and there are no more -+ // delimiters. This avoids an issue where malicious input could contain additional delimiters -+ // causing unecessary overhead parsing tokens. -+ signature, _, unexpected := strings.Cut(remain, tokenDelimiter) -+ if unexpected { -+ return nil, false -+ } -+ parts[2] = signature -+ -+ return parts, true -+} -+ - // DecodeSegment decodes a JWT specific base64url encoding. This function will - // take into account whether the [Parser] is configured with additional options, - // such as [WithStrictDecoding] or [WithPaddingAllowed]. -diff --git a/vendor/github.com/golang-jwt/jwt/v5/token.go b/vendor/github.com/golang-jwt/jwt/v5/token.go -index 352873a..9c7f4ab 100644 ---- a/vendor/github.com/golang-jwt/jwt/v5/token.go -+++ b/vendor/github.com/golang-jwt/jwt/v5/token.go -@@ -75,7 +75,7 @@ func (t *Token) SignedString(key interface{}) (string, error) { - } - - // SigningString generates the signing string. This is the most expensive part --// of the whole deal. Unless you need this for something special, just go -+// of the whole deal. Unless you need this for something special, just go - // straight for the SignedString. - func (t *Token) SigningString() (string, error) { - h, err := json.Marshal(t.Header) -diff --git a/vendor/modules.txt b/vendor/modules.txt -index 35d0433..f49c006 100644 ---- a/vendor/modules.txt -+++ b/vendor/modules.txt -@@ -568,10 +568,10 @@ github.com/gogo/protobuf/proto - # github.com/golang-jwt/jwt v3.2.2+incompatible - ## explicit - github.com/golang-jwt/jwt --# github.com/golang-jwt/jwt/v4 v4.5.0 -+# github.com/golang-jwt/jwt/v4 v4.5.2 - ## explicit; go 1.16 - github.com/golang-jwt/jwt/v4 --# github.com/golang-jwt/jwt/v5 v5.2.0 -+# github.com/golang-jwt/jwt/v5 v5.2.2 - ## explicit; go 1.18 - github.com/golang-jwt/jwt/v5 - # github.com/golang/glog v1.1.2 diff --git a/SPECS/osbuild-composer.spec b/SPECS/osbuild-composer.spec index 434dcb8..6894f0b 100644 --- a/SPECS/osbuild-composer.spec +++ b/SPECS/osbuild-composer.spec @@ -12,7 +12,7 @@ %global goipath github.com/osbuild/osbuild-composer -Version: 101 +Version: 101.4 %gometa @@ -24,57 +24,43 @@ usage, it can also upload images directly to cloud. It is compatible with composer-cli and cockpit-composer clients. } -Name: osbuild-composer -Release: 4.0.1%{?dist} -Summary: An image building service based on osbuild +Name: osbuild-composer +Release: 1%{?dist} +Summary: An image building service based on osbuild # osbuild-composer doesn't have support for building i686 and armv7hl images -ExcludeArch: i686 armv7hl +ExcludeArch: i686 armv7hl # Upstream license specification: Apache-2.0 -License: Apache-2.0 -URL: %{gourl} -Source0: %{gosource} +License: Apache-2.0 +URL: %{gourl} +Source0: %{gosource} -Patch0: CVE-2025-30204.patch -Patch1001: 1001-Add-Oracle-Linux-8-and-9-support.patch -Patch1002: 1002-remove-edge-openstack-and-vmdk-options-for-rhel8-and.patch -Patch1003: 1003-Add-UEK-repositories-and-set-uek-kernel-as-default.patch -Patch1004: 1004-Add-support-for-OCI-hybrid-images.patch -Patch1005: 1005-Add-autorelabel-on-first-boot-for-qcow-oci-images.patch -Patch1006: 1006-Update-cmdline-parameters-for-OCI-images.patch -Patch1007: 1007-remove-GCP-build-option.patch -Patch1008: 1008-remove-vmware-ova-image-from-build-options.patch -Patch1009: 1009-Increase-default-boot-size-to-1GB.patch.patch -Patch1010: 1010-Remove-wsl-and-minimal-raw-image-types.patch -Patch1011: 1011-Support-using-repository-definitions-with-OCI-variab.patch -Patch1012: 1012-Update-Oracle-repositories-to-contain-OCI-variables.patch - -BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} -BuildRequires: systemd -BuildRequires: krb5-devel -BuildRequires: python3-docutils -BuildRequires: make +BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} +BuildRequires: systemd +BuildRequires: krb5-devel +BuildRequires: python3-docutils +BuildRequires: make # Build requirements of 'theproglottis/gpgme' package -BuildRequires: gpgme-devel -BuildRequires: libassuan-devel +BuildRequires: gpgme-devel +BuildRequires: libassuan-devel # Build requirements of 'github.com/containers/storage' package -BuildRequires: device-mapper-devel +BuildRequires: device-mapper-devel %if 0%{?fedora} -BuildRequires: systemd-rpm-macros -BuildRequires: git +BuildRequires: systemd-rpm-macros +BuildRequires: git # Build requirements of 'github.com/containers/storage' package -BuildRequires: btrfs-progs-devel +BuildRequires: btrfs-progs-devel # DO NOT REMOVE the BUNDLE_START and BUNDLE_END markers as they are used by 'tools/rpm_spec_add_provides_bundle.sh' to generate the Provides: bundled list # BUNDLE_START # BUNDLE_END %endif -Requires: %{name}-core = %{version}-%{release} -Requires: %{name}-worker = %{version}-%{release} -Requires: systemd +Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-worker = %{version}-%{release} +Requires: systemd -Provides: weldr +Provides: weldr %description %{common_description} @@ -170,13 +156,6 @@ install -m 0644 -vp repositories/centos-* %{buildroot}% # CentOS 8 only supports building for CentOS 8 install -m 0644 -vp repositories/centos-%{centos}* %{buildroot}%{_datadir}/osbuild-composer/repositories/ 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 @@ -192,7 +171,6 @@ install -m 0644 -vp repositories/rhel-%{rhel}* %{buildroot}% %endif %endif %endif -%endif # Fedora can build for all included fedora releases %if 0%{?fedora} @@ -320,10 +298,10 @@ cd $PWD/_build/src/%{goipath} %{_sysusersdir}/osbuild-composer.conf %package core -Summary: The core osbuild-composer binary -Requires: osbuild-depsolve-dnf >= %{min_osbuild_version} -Provides: %{name}-dnf-json = %{version}-%{release} -Obsoletes: %{name}-dnf-json < %{version}-%{release} +Summary: The core osbuild-composer binary +Requires: osbuild-depsolve-dnf >= %{min_osbuild_version} +Provides: %{name}-dnf-json = %{version}-%{release} +Obsoletes: %{name}-dnf-json < %{version}-%{release} %description core The core osbuild-composer binary. This is suitable both for spawning in containers and by systemd. @@ -333,16 +311,16 @@ The core osbuild-composer binary. This is suitable both for spawning in containe %{_datadir}/osbuild-composer/ %package worker -Summary: The worker for osbuild-composer -Requires: systemd -Requires: qemu-img -Requires: osbuild >= %{min_osbuild_version} -Requires: osbuild-ostree >= %{min_osbuild_version} -Requires: osbuild-lvm2 >= %{min_osbuild_version} -Requires: osbuild-luks2 >= %{min_osbuild_version} -Requires: osbuild-depsolve-dnf >= %{min_osbuild_version} -Provides: %{name}-dnf-json = %{version}-%{release} -Obsoletes: %{name}-dnf-json < %{version}-%{release} +Summary: The worker for osbuild-composer +Requires: systemd +Requires: qemu-img +Requires: osbuild >= %{min_osbuild_version} +Requires: osbuild-ostree >= %{min_osbuild_version} +Requires: osbuild-lvm2 >= %{min_osbuild_version} +Requires: osbuild-luks2 >= %{min_osbuild_version} +Requires: osbuild-depsolve-dnf >= %{min_osbuild_version} +Provides: %{name}-dnf-json = %{version}-%{release} +Obsoletes: %{name}-dnf-json < %{version}-%{release} %description worker The worker for osbuild-composer @@ -375,61 +353,61 @@ fi %if %{with tests} || 0%{?rhel} %package tests -Summary: Integration tests +Summary: Integration tests %if %{with relax_requires} -Requires: %{name} +Requires: %{name} %else -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %endif -Requires: composer-cli -Requires: createrepo_c -Requires: xorriso -Requires: qemu-kvm-core -Requires: systemd-container -Requires: jq -Requires: unzip -Requires: container-selinux -Requires: dnsmasq -Requires: krb5-workstation -Requires: podman -Requires: python3 -Requires: sssd-krb5 -Requires: libvirt-client libvirt-daemon -Requires: libvirt-daemon-config-network -Requires: libvirt-daemon-config-nwfilter -Requires: libvirt-daemon-driver-interface -Requires: libvirt-daemon-driver-network -Requires: libvirt-daemon-driver-nodedev -Requires: libvirt-daemon-driver-nwfilter -Requires: libvirt-daemon-driver-qemu -Requires: libvirt-daemon-driver-secret -Requires: libvirt-daemon-driver-storage -Requires: libvirt-daemon-driver-storage-disk -Requires: libvirt-daemon-kvm -Requires: qemu-img -Requires: qemu-kvm -Requires: rpmdevtools -Requires: virt-install -Requires: expect -Requires: python3-lxml -Requires: httpd -Requires: mod_ssl -Requires: openssl -Requires: firewalld -Requires: podman-plugins -Requires: dnf-plugins-core -Requires: skopeo -Requires: make -Requires: python3-pip +Requires: composer-cli +Requires: createrepo_c +Requires: xorriso +Requires: qemu-kvm-core +Requires: systemd-container +Requires: jq +Requires: unzip +Requires: container-selinux +Requires: dnsmasq +Requires: krb5-workstation +Requires: podman +Requires: python3 +Requires: sssd-krb5 +Requires: libvirt-client libvirt-daemon +Requires: libvirt-daemon-config-network +Requires: libvirt-daemon-config-nwfilter +Requires: libvirt-daemon-driver-interface +Requires: libvirt-daemon-driver-network +Requires: libvirt-daemon-driver-nodedev +Requires: libvirt-daemon-driver-nwfilter +Requires: libvirt-daemon-driver-qemu +Requires: libvirt-daemon-driver-secret +Requires: libvirt-daemon-driver-storage +Requires: libvirt-daemon-driver-storage-disk +Requires: libvirt-daemon-kvm +Requires: qemu-img +Requires: qemu-kvm +Requires: rpmdevtools +Requires: virt-install +Requires: expect +Requires: python3-lxml +Requires: httpd +Requires: mod_ssl +Requires: openssl +Requires: firewalld +Requires: podman-plugins +Requires: dnf-plugins-core +Requires: skopeo +Requires: make +Requires: python3-pip %if 0%{?fedora} # koji and ansible are not in RHEL repositories. Depending on them breaks RHEL # gating (see OSCI-1541). The test script must enable EPEL and install those # packages manually. -Requires: koji -Requires: ansible +Requires: koji +Requires: ansible %endif %ifarch %{arm} -Requires: edk2-aarch64 +Requires: edk2-aarch64 %endif %description tests @@ -443,17 +421,8 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog -* Thu Jun 26 2025 EL Errata - 101-4.0.1 -- Rebuilt to fix: - - CVE-2024-34156 - - CVE-2024-1394 - - RHEL-24303 - - RHEL-57905 -- 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] -- support for building OL8/9 images on Oracle Linux 8 [Orabug: 36400619] +* Thu Jul 17 2025 Achilleas Koutsou - 101.4-1 +- Resolves: RHEL-95416 * Tue Jun 24 2025 Ondřej Budai - 101-4 - Resolves: RHEL-89279 (CVE-2025-22871)