From e8e6e062afc6d06df86f9ef63e787bd178b57e92 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 27 Nov 2025 12:01:54 +0000 Subject: [PATCH 1/2] import OL osbuild-composer-149-2.0.1.el9_7 --- ...-repositories-for-OL-8.10-and-OL-9.6.patch | 118 +++++ ...d-support-for-OL-on-osbuild-composer.patch | 192 ++++++++ ...3-Removing-non-supported-image-types.patch | 89 ++++ SOURCES/1004-Fix-packageSets.patch | 252 ++++++++++ ...1005-Increase-support-for-OCI-images.patch | 452 ++++++++++++++++++ ...06-Increase-default-boot-size-to-1GB.patch | 27 ++ ...pository-definitions-with-OCI-variab.patch | 85 ++++ ...epositories-to-contain-OCI-variables.patch | 121 +++++ ...fy-repo-name-removing-minor-versions.patch | 79 +++ ...Oscap-customization-for-Oracle-Linux.patch | 85 ++++ SOURCES/enable-bsi-oscap-profile.patch | 74 +++ SPECS/osbuild-composer.spec | 206 ++++---- 12 files changed, 1698 insertions(+), 82 deletions(-) create mode 100644 SOURCES/1001-Add-repositories-for-OL-8.10-and-OL-9.6.patch create mode 100644 SOURCES/1002-Add-support-for-OL-on-osbuild-composer.patch create mode 100644 SOURCES/1003-Removing-non-supported-image-types.patch create mode 100644 SOURCES/1004-Fix-packageSets.patch create mode 100644 SOURCES/1005-Increase-support-for-OCI-images.patch create mode 100644 SOURCES/1006-Increase-default-boot-size-to-1GB.patch create mode 100644 SOURCES/1007-Support-using-repository-definitions-with-OCI-variab.patch create mode 100644 SOURCES/1008-Update-Oracle-repositories-to-contain-OCI-variables.patch create mode 100644 SOURCES/1009-Simplify-repo-name-removing-minor-versions.patch create mode 100644 SOURCES/1010-Oscap-customization-for-Oracle-Linux.patch create mode 100644 SOURCES/enable-bsi-oscap-profile.patch diff --git a/SOURCES/1001-Add-repositories-for-OL-8.10-and-OL-9.6.patch b/SOURCES/1001-Add-repositories-for-OL-8.10-and-OL-9.6.patch new file mode 100644 index 0000000..51cdfc1 --- /dev/null +++ b/SOURCES/1001-Add-repositories-for-OL-8.10-and-OL-9.6.patch @@ -0,0 +1,118 @@ +From 3b450033adda7996c8a9eb92bfd057fff0ac5e3e Mon Sep 17 00:00:00 2001 +From: Josue David Hernandez Gutierrez +Date: Wed, 30 Oct 2024 17:08:55 +0000 +Subject: [PATCH 01/10] Add repositories for OL-8.10 and OL-9.6 + +Signed-off-by: Josue David Hernandez Gutierrez +--- + .../images/data/repositories/ol-810.json | 42 ++++++++++++++++ + .../images/data/repositories/ol-96.json | 48 +++++++++++++++++++ + 2 files changed, 90 insertions(+) + create mode 100644 vendor/github.com/osbuild/images/data/repositories/ol-810.json + create mode 100644 vendor/github.com/osbuild/images/data/repositories/ol-96.json + +diff --git a/vendor/github.com/osbuild/images/data/repositories/ol-810.json b/vendor/github.com/osbuild/images/data/repositories/ol-810.json +new file mode 100644 +index 0000000..a23b3c6 +--- /dev/null ++++ b/vendor/github.com/osbuild/images/data/repositories/ol-810.json +@@ -0,0 +1,42 @@ ++{ ++ "aarch64": [ ++ { ++ "name": "baseos", ++ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/baseos/latest/aarch64", ++ "check_gpg": false, ++ "rhsm": false ++ }, ++ { ++ "name": "uekr7", ++ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/UEKR7/aarch64/", ++ "check_gpg": false, ++ "rhsm": false ++ }, ++ { ++ "name": "appstream", ++ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/appstream/aarch64", ++ "check_gpg": false, ++ "rhsm": false ++ } ++ ], ++ "x86_64": [ ++ { ++ "name": "baseos", ++ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/baseos/latest/x86_64", ++ "check_gpg": false, ++ "rhsm": false ++ }, ++ { ++ "name": "uekr7", ++ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/UEKR7/x86_64/", ++ "check_gpg": false, ++ "rhsm": false ++ }, ++ { ++ "name": "appstream", ++ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/appstream/x86_64", ++ "check_gpg": false, ++ "rhsm": false ++ } ++ ] ++} +diff --git a/vendor/github.com/osbuild/images/data/repositories/ol-96.json b/vendor/github.com/osbuild/images/data/repositories/ol-96.json +new file mode 100644 +index 0000000..2a9608a +--- /dev/null ++++ b/vendor/github.com/osbuild/images/data/repositories/ol-96.json +@@ -0,0 +1,48 @@ ++{ ++ "aarch64": [ ++ { ++ "name": "baseos", ++ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/aarch64", ++ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", ++ "check_gpg": true, ++ "rhsm": false ++ }, ++ { ++ "name": "uekr8", ++ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/UEKR8/aarch64/", ++ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", ++ "check_gpg": true, ++ "rhsm": false ++ }, ++ { ++ "name": "appstream", ++ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/appstream/aarch64", ++ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGHncu8BEAC2dhocMZkdapnP9o/MvAnKOczaSpF4Cj9yqt49bxLPJCY57jz9\n2ZkJ5iGk6kpBt4rPTh18aAl30T+nPP8VMQjMhvHJKfZmBtaJJ5RpvvpK5mj1UgRJ\n4DQX7gqAbT0s/uZZcouZsJzXo3c7GNMrim1C+ScfGG6BoB6GVBK74jFeJNMsxZ2Y\nBwQhpE+KG+1zD94RZCySykJjNoKj+U4W5H2XdB/mNEc8icFqxjJGZ5BN0DA2Wqxn\nmwELTO3Q2ne1y9+sPn2YKhRqyihuZYaUPR/Jpdki93mk61MdaoTTxFPZ8FWAYrAW\n9KVdreT8K33SaTFFpmhbpndPEYesgCqDqiZG7Ywjgbf2nqSOzBr2ZX23PX7QUCvQ\nar58bNbWENLhC3B950TK+r23kkPa3GICE9WP5TftWJdbJMWRBX3YhdNooNGGCbeB\nxM7B/UV9hSRx1S/US8HvDhJezZDuKrpPXrNWJTuW9Kty2WGwUkEDT2GBbcjx9ocJ\nfqyNJKhaLoYKCVlsmhJUi4xCY0CDDapekWLZOzHB2zgT49uIjawV5ex6pA7oLaPI\nhQGvTcCl7GFWOP/6feazzIpnsJ4V3B2DoLnAevpZlINo/bi3Hv/YmbvE6NyYzD6c\n1y90pc0+Om1trLPCAZpaO1I369ZhLl6T/mCd92hrCG1y8K3PFiRIKpEMVwARAQAB\ntDVPcmFjbGUgTGludXggKHJlbGVhc2Uga2V5IDEpIDxzZWNhbGVydF91c0BvcmFj\nbGUuY29tPokCVAQTAQoAPhYhBD5tgm0/urOJwvOONLxNBqCNi3VvBQJinlnsAhsD\nBQklmAYABQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJELxNBqCNi3Vv3LEP/2au\nkXzbdA/T/7i+4AbGFfYnTWqmZy58wfteDNy1sk6cPmfOUqZQXUrJcSGqqeIDjPvl\nKNExpee/Ja4NGg2YfzkwH5IK5sXmEDKObXRCXGZh9/WyYpr4TBoDU2rSYBP4sbKm\nPsnVoRalt2Zb0qbQF8GilytoRabjI0gLzwhmoHBZMMc3MIO14KQ5yFbekaJZKcxE\nBxaDQ1NDZV1rOVbkg0yDLS9Nw89dDYWVn1wx0foRJcD277ExvmaB4vmC5yayo4ss\ncFldYLu7W9FHmh46flXQGfduORCbDFfjn92eB0jdrkuoEhVRpljAtMO15GMpuVbv\nHzbImI2f1MfydOa6dHbRAlzeV37fPz+1nO9IWdXqFeRG0nrH2gB02AfeoObMkK/a\nXYT9sq1mC5DaK6fbOPWlY+c2hIq0BhUpe+OBdDfmm7L+si9Ffj2sUdn4sHLN6Tj7\nBrJuWmJEz42+rblDNBkrdBC6XXDaRYILKSuGD65PVV+/pVl1c2EOqcktW00iiehb\neLhj2sz6NaoO5Rhx0J3pMsaCaEBAm8P6UxQSx4iGhZ8Kh5O1SVVlqu3xOhSGOKRE\nsS8gIjeV/Jl3frR4eZG/BpzdTjKZmQV7dvJ4gDuDE+X7rZBzUm7nggyE2pV6UbTD\n5Qwy+ASQfYHfHK4lsHD4kbO/We6H1fEFPlzlr14UuQINBGHncu8BEADBG52gWRob\nVEsQIzAfq2obFnwMroxMupXrDBka7i6cUJw8HsqyHs9maGxAuRDlAma2MBPUYcbm\nDH3bmctaUR7CA1RouPkb6qbZXwSwpvgN4eh4naPX20/VEp/cd5DhKWjP9yC70weh\nr4LmGWV41jBAMK0G1l6+FDw2ITgsamZP+tw0swCKqzpIY2waiygCtPHCCCFMuZ6S\n7hzQpsKVFh8zqzRxMs6Mni9olk4+xwng0ahYfoe2esByR2M1kGX62Y6BOcIRX1cE\nzYFCUww5GrjZdJoObBtffUSz+q2LNOBcqg5huRd8BoC+k5yrXUq8ypspfV1kNEI3\n/ebFew6A8sdf2c+sOdTxTu4MI5iXM1fhCC6X4lAN8w1Ga3ML+k/kgL75mH62Yyzr\nOHXNkylTDfxz9qvq6qszVfWdzVaGXRfulW5nAbAXhuX1gmgZW+M7IQ22xyWC+I60\nUcaE2l9QtHFKuekdYnekTkSUA0ghVwuw+JCQZGQbq5LqbA5TkEYuibBOJD3MZYQ5\nC3DK4KHs/3wxf2aq+Pkf3mpSscC4B0Ba5tlpJawUWqnUmGd208sfUwD20MFfHM+1\nN+M6JYCv0tC0cyAV9Jq74bAUDXLMfkGKZyAWmlPaZBMMt4WaN0r2PAKp00T6PX6x\njTM6/aNDvNTpsaaUpMXRzH13AiJ/1SjfZwARAQABiQI8BBgBCgAmAhsMFiEEPm2C\nbT+6s4nC8440vE0GoI2LdW8FAmKeWsgFCSRtulkACgkQvE0GoI2LdW/pig//Zi0a\nbmFJKTxku0/LMI31ZaLn9gzXjv2ugmJumfXAce+nlaheCNBa+IMLQdAmrbislzLs\nqXX2+6Eqh4Q/vqGLCkElIzT9ulkgwwEp0cVF6jnXqlWHa0a/T6oAq10jRneaQFCE\nt6hweJ9KTUQufp5aAiZr/GVpBJLJ8kfOx+5eHvDj+VFlFUhpzzns/NfN5N+bthJ/\nWbt49tzmWaWoEFA0tlwMBPO3zEh/mo5lys0GqENPs4Yb4tL82qg+SG7jHSuH2lZk\nXLLyLQ6p63VZysL9+UTBtafs5jxnTopQFIXtzAOwdtQ8o7/6hhsUchRoUy23EIHT\nJ25yA2Qtb8Z/1m/G0e3lz46xHBPIs8FKSOPToCT6E1+9lomnzJPRBCCDTZO5imfX\n4N4l7BodW9nb7zEMHCi2BUM+InpSsEkQkQFs0HIRI2KHSyY30uN0pVXJLOoVQIBr\nWdUzLTTkN9w43fLpkcFXGbpU+pZvK2uksC3O+eBhIpZA9E7iZDwfEaZlUKO5kFvS\nV5f8ZM1jbEb0sOZNNNEaEhTFTl8pQPc2GqgZ3rYt9mqH5OwhzKftV9PDYulIbY+Y\nAN6eJhHj8Eu/IlxG6iYCDmF2hOVPs9aLo9zqdxbu8B6rUyVPOwfNbOR1U7WMRCYm\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", ++ "check_gpg": true, ++ "rhsm": false ++ } ++ ], ++ "x86_64": [ ++ { ++ "name": "baseos", ++ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/x86_64", ++ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", ++ "check_gpg": true, ++ "rhsm": false ++ }, ++ { ++ "name": "uekr8", ++ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/UEKR8/x86_64/", ++ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", ++ "check_gpg": true, ++ "rhsm": false ++ }, ++ { ++ "name": "appstream", ++ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/appstream/x86_64", ++ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", ++ "check_gpg": true, ++ "rhsm": false ++ } ++ ] ++} +-- +2.47.3 + diff --git a/SOURCES/1002-Add-support-for-OL-on-osbuild-composer.patch b/SOURCES/1002-Add-support-for-OL-on-osbuild-composer.patch new file mode 100644 index 0000000..7db4063 --- /dev/null +++ b/SOURCES/1002-Add-support-for-OL-on-osbuild-composer.patch @@ -0,0 +1,192 @@ +From 8143c24dc5903673c74852420ed92a6bb3c124b2 Mon Sep 17 00:00:00 2001 +From: Josue David Hernandez Gutierrez +Date: Fri, 17 Oct 2025 00:33:57 +0000 +Subject: [PATCH 02/10] Add support for OL on osbuild-composer + +Signed-off-by: Josue David Hernandez Gutierrez +--- + internal/runner/ol.go | 18 +++++++++++ + .../blueprint/pkg/blueprint/customizations.go | 2 +- + .../images/data/distrodefs/distros.yaml | 30 +++++++++++++++++++ + .../data/distrodefs/rhel-8/imagetypes.yaml | 15 ++++++++++ + .../data/distrodefs/rhel-9/imagetypes.yaml | 12 ++++++++ + .../osbuild/images/pkg/runner/ol.go | 18 +++++++++++ + 6 files changed, 94 insertions(+), 1 deletion(-) + create mode 100644 internal/runner/ol.go + create mode 100644 vendor/github.com/osbuild/images/pkg/runner/ol.go + +diff --git a/internal/runner/ol.go b/internal/runner/ol.go +new file mode 100644 +index 0000000..4d28e91 +--- /dev/null ++++ b/internal/runner/ol.go +@@ -0,0 +1,18 @@ ++package runner ++ ++type Ol struct { ++ Version uint64 ++} ++ ++func (o *Ol) String() string { ++ return "org.osbuild.ol" ++} ++ ++func (o *Ol) GetBuildPackages() []string { ++ packages := []string{ ++ "glibc", // ldconfig ++ "platform-python", // osbuild ++ "python3", ++ } ++ return packages ++} +diff --git a/vendor/github.com/osbuild/blueprint/pkg/blueprint/customizations.go b/vendor/github.com/osbuild/blueprint/pkg/blueprint/customizations.go +index 7d56026..2500de0 100644 +--- a/vendor/github.com/osbuild/blueprint/pkg/blueprint/customizations.go ++++ b/vendor/github.com/osbuild/blueprint/pkg/blueprint/customizations.go +@@ -285,7 +285,7 @@ func (c *Customizations) GetKernel() *KernelCustomization { + } + + if kernelName == "" { +- kernelName = "kernel" ++ kernelName = "kernel-uek" + } + + return &KernelCustomization{ +diff --git a/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml b/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml +index f1d3dab..9cb9645 100644 +--- a/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml ++++ b/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml +@@ -257,6 +257,21 @@ distros: + x86_64: "quay.io/toolbx-images/centos-toolbox:stream{{.MajorVersion}}" + aarch64: "quay.io/toolbx-images/centos-toolbox:stream{{.MajorVersion}}" + ++ - &ol9 ++ <<: *rhel9 ++ name: "ol-{{.MajorVersion}}.{{.MinorVersion}}" ++ match: '(?Pol)-(?P9)\.?(?P[0-9]{1,2})' ++ product: "Oracle Linux" ++ os_version: "{{.MajorVersion}}.{{.MinorVersion}}" ++ release_version: 9 ++ module_platform_id: "platform:el9" ++ vendor: "redhat" ++ ostree_ref_tmpl: "ol/9/%s/edge" ++ iso_label_tmpl: "OracleLinux-{{.Distro.MajorVersion}}-{{.Distro.MinorVersion}}-{{.Arch}}-dvd" ++ runner: ++ build_packages: *rhel9_runner_build_packages ++ name: org.osbuild.ol ++ + - &rhel8 + name: "rhel-{{.MajorVersion}}.{{.MinorVersion}}" + # rhel8 support being named "rhel-81" for "rhel-8.1" or "rhel-810" for "rhel-8.10" etc +@@ -344,6 +359,21 @@ distros: + x86_64: "quay.io/toolbx-images/centos-toolbox:stream{{.MajorVersion}}" + aarch64: "quay.io/toolbx-images/centos-toolbox:stream{{.MajorVersion}}" + ++ - &ol8 ++ <<: *rhel8 ++ name: "ol-{{.MajorVersion}}.{{.MinorVersion}}" ++ match: '(?Pol)-(?P8)\.?(?P[0-9]{1,2})' ++ product: "Oracle Linux" ++ os_version: "{{.MajorVersion}}.{{.MinorVersion}}" ++ release_version: 8 ++ module_platform_id: "platform:el8" ++ vendor: "redhat" ++ ostree_ref_tmpl: "ol/8/%s/edge" ++ iso_label_tmpl: "OracleLinux-{{.Distro.MajorVersion}}-{{.Distro.MinorVersion}}-{{.Arch}}-dvd" ++ runner: ++ build_packages: *rhel8_runner_build_packages ++ name: org.osbuild.ol ++ + - &rhel7 + name: "rhel-{{.MajorVersion}}.{{.MinorVersion}}" + match: 'rhel-7\.[0-9]' +diff --git a/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml b/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml +index ed22763..faba3b9 100644 +--- a/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml ++++ b/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml +@@ -137,6 +137,14 @@ + # original code so this never gets actually added so we + # don't add it here either + # - "rhc" ++ "ol kernel": ++ when: ++ distro_name: "ol" ++ append: ++ include: ++ - "kernel-uek-core" ++ - "kernel-uek-modules" ++ - "kernel-uek" + + # Default AMI (custom image built by users) images config. + # The configuration does not touch the RHSM configuration at all. +@@ -455,6 +463,13 @@ + append: + include: + - "biosdevname" ++ "ol kernel": ++ when: ++ distro_name: "ol" ++ append: ++ include: ++ - "kernel-uek" ++ + + anaconda_boot_pkgset: &anaconda_boot_pkgset + conditions: +diff --git a/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml b/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml +index 0f1032c..a028bf2 100644 +--- a/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml ++++ b/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml +@@ -446,6 +446,12 @@ + append: + include: + - "biosdevname" ++ "ol kernel": ++ when: ++ distro_name: "ol" ++ append: ++ include: ++ - "kernel-uek" + + wsl: &wsl_config + config: +@@ -648,6 +654,12 @@ + append: + include: + - "dmidecode" ++ "ol kernel": ++ when: ++ distro_name: "ol" ++ append: ++ include: ++ - "kernel-uek" + + partitioning: + ids: +diff --git a/vendor/github.com/osbuild/images/pkg/runner/ol.go b/vendor/github.com/osbuild/images/pkg/runner/ol.go +new file mode 100644 +index 0000000..4d28e91 +--- /dev/null ++++ b/vendor/github.com/osbuild/images/pkg/runner/ol.go +@@ -0,0 +1,18 @@ ++package runner ++ ++type Ol struct { ++ Version uint64 ++} ++ ++func (o *Ol) String() string { ++ return "org.osbuild.ol" ++} ++ ++func (o *Ol) GetBuildPackages() []string { ++ packages := []string{ ++ "glibc", // ldconfig ++ "platform-python", // osbuild ++ "python3", ++ } ++ return packages ++} +-- +2.47.3 + diff --git a/SOURCES/1003-Removing-non-supported-image-types.patch b/SOURCES/1003-Removing-non-supported-image-types.patch new file mode 100644 index 0000000..84e4404 --- /dev/null +++ b/SOURCES/1003-Removing-non-supported-image-types.patch @@ -0,0 +1,89 @@ +From 22c637202d5cef5fad099b14b4148605e6b2a9f1 Mon Sep 17 00:00:00 2001 +From: Josue David Hernandez Gutierrez +Date: Fri, 17 Oct 2025 00:41:35 +0000 +Subject: [PATCH 03/10] Remove unsopported image types + +Signed-off-by: Josue David Hernandez Gutierrez +--- + .../images/data/distrodefs/distros.yaml | 58 +++++++++++++++++++ + 1 file changed, 58 insertions(+) + +diff --git a/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml b/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml +index 0a737a6..8fe4340 100644 +--- a/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml ++++ b/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml +@@ -270,6 +270,35 @@ distros: + runner: + build_packages: *rhel9_runner_build_packages + name: org.osbuild.ol ++ conditions: ++ "some images are not supported by Oracle Linux": ++ when: ++ distro_name: "ol" ++ ignore_image_types: ++ - edge-ami ++ - edge-commit ++ - edge-container ++ - edge-installer ++ - edge-raw-image ++ - edge-simplified-installer ++ - edge-vsphere ++ - openstack ++ - gce ++ - minimal-raw ++ - vmdk ++ - ova ++ - vagrant-libvirt ++ - vagrant-virtualbox ++ - azure ++ # this images are ignored in all non rhel images ++ - azure-cvm ++ - azure-rhui ++ - azure-sap-rhui ++ - azure-sapapps-rhui ++ - ec2 ++ - ec2-sap ++ - ec2-ha ++ - wsl + + - &rhel8 + name: "rhel-{{.MajorVersion}}.{{.MinorVersion}}" +@@ -371,6 +400,35 @@ distros: + runner: + build_packages: *rhel8_runner_build_packages + name: org.osbuild.ol ++ conditions: ++ "some images are not supported by Oracle Linux": ++ when: ++ distro_name: "ol" ++ ignore_image_types: ++ - edge-ami ++ - edge-commit ++ - edge-container ++ - edge-installer ++ - edge-raw-image ++ - edge-simplified-installer ++ - edge-vsphere ++ - openstack ++ - gce ++ - minimal-raw ++ - vmdk ++ - ova ++ - vagrant-libvirt ++ - vagrant-virtualbox ++ - azure ++ # this images are ignored in all non rhel images ++ - azure-cvm ++ - azure-rhui ++ - azure-sap-rhui ++ - azure-sapapps-rhui ++ - ec2 ++ - ec2-sap ++ - ec2-ha ++ - wsl + + - &rhel7 + name: "rhel-{{.MajorVersion}}.{{.MinorVersion}}" +-- +2.47.3 + diff --git a/SOURCES/1004-Fix-packageSets.patch b/SOURCES/1004-Fix-packageSets.patch new file mode 100644 index 0000000..ec2ec7a --- /dev/null +++ b/SOURCES/1004-Fix-packageSets.patch @@ -0,0 +1,252 @@ +From b1f36f1f4f924b10b14f61e978b8324ec75e0b08 Mon Sep 17 00:00:00 2001 +From: Josue David Hernandez Gutierrez +Date: Fri, 17 Oct 2025 00:53:53 +0000 +Subject: [PATCH 04/10] fix packageSets + +Removing packages not available in Oracle Linux +like redhat-release-eula and adding packages needed for some Oracle +Linux images like dracut-config-rescue + +Signed-off-by: Josue David Hernandez Gutierrez +--- + .../data/distrodefs/rhel-8/imagetypes.yaml | 37 ++++++++++++--- + .../data/distrodefs/rhel-9/imagetypes.yaml | 45 ++++++++++++++++--- + 2 files changed, 68 insertions(+), 14 deletions(-) + +diff --git a/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml b/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml +index faba3b9..660190b 100644 +--- a/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml ++++ b/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml +@@ -16,7 +16,6 @@ + - "NetworkManager" + - "NetworkManager-cloud-setup" + - "redhat-release" +- - "redhat-release-eula" + - "rsync" + - "tar" + - "yum-utils" +@@ -57,6 +56,12 @@ + append: + include: + - "insights-client" ++ "include redhat-release-eula for non oracle linux": ++ when: ++ not_distro_name: "ol" ++ append: ++ include: ++ - "redhat-release-eula" + + azure_common_pkgset: &azure_common_pkgset + include: +@@ -95,7 +100,6 @@ + - "buildah" + - "cockpit-podman" + - "containernetworking-plugins" +- - "dnf-plugin-spacewalk" + - "dracut-config-rescue" + - "glibc-all-langpacks" + - "iprutils" +@@ -121,7 +125,6 @@ + - "libertas-usb8388-firmware" + - "plymouth" + - "podman" +- - "python3-dnf-plugin-spacewalk" + - "python3-hwdata" + - "python3-rhnlib" + - "rhn-check" +@@ -593,7 +596,6 @@ + - "pigz" + - "python3-pyatspi" + - "rdma-core" +- - "redhat-release-eula" + - "rpm-ostree" + - "rsync" + - "rsyslog" +@@ -638,6 +640,12 @@ + append: + include: + - "dmidecode" ++ "include redhat-release-eula for non oracle linux": ++ when: ++ not_distro_name: "ol" ++ append: ++ include: ++ - "redhat-release-eula" + + gce_common_pkgset: &gce_common_pkgset + include: +@@ -726,7 +734,6 @@ + - "python3-jsonschema" + - "qemu-guest-agent" + - "redhat-release" +- - "redhat-release-eula" + - "rsync" + - "tar" + - "tcpdump" +@@ -737,7 +744,6 @@ + - "alsa-lib" + - "alsa-tools-firmware" + - "biosdevname" +- - "dnf-plugin-spacewalk" + - "dracut-config-rescue" + - "fedora-release" + - "fedora-repos" +@@ -779,6 +785,12 @@ + include: + - "insights-client" + - "subscription-manager-cockpit" ++ "include redhat-release-eula for non oracle linux": ++ when: ++ not_distro_name: "ol" ++ append: ++ include: ++ - "redhat-release-eula" + + disk_sizes: + default_required_partition_sizes: &default_required_dir_sizes +@@ -1292,6 +1304,18 @@ image_types: + - "yum" + conditions: + <<: *condition_rhel_insights_clinet_subman ++ "include redhat-release-eula for non oracle linux": ++ when: ++ not_distro_name: "ol" ++ append: ++ include: ++ - "redhat-release-eula" ++ "include dracut-config-rescue for ol": ++ when: ++ distro_name: "ol" ++ append: ++ include: ++ - "dracut-config-rescue" + + ami: &ami + filename: "image.raw" +@@ -2485,7 +2509,6 @@ image_types: + - "biosdevname" + - "cpio" + - "diffutils" +- - "dnf-plugin-spacewalk" + - "dracut" + - "elfutils-debuginfod-client" + - "fedora-release" +diff --git a/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml b/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml +index a028bf2..3e0f536 100644 +--- a/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml ++++ b/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml +@@ -158,7 +158,6 @@ + - "langpacks-en" + - "NetworkManager-cloud-setup" + - "redhat-release" +- - "redhat-release-eula" + - "rsync" + - "tuned" + - "tar" +@@ -202,6 +201,13 @@ + append: + include: + - "system-reinstall-bootc" ++ "include redhat-release-eula for not oracle linux": ++ when: ++ not_distro_name: "ol" ++ append: ++ include: ++ - "redhat-release-eula" ++ + azure_base_pkgset: &azure_base_pkgset + include: + - "@Server" +@@ -604,7 +610,6 @@ + - "prefixdevname" + - "python3-pyatspi" + - "rdma-core" +- - "redhat-release-eula" + - "rng-tools" + - "rpcbind" + - "rpm-ostree" +@@ -654,7 +659,13 @@ + append: + include: + - "dmidecode" +- "ol kernel": ++ "include redhat-release-eula for not oracle linux": ++ when: ++ not_distro_name: "ol" ++ append: ++ include: ++ - "redhat-release-eula" ++ "Custom packages for Oracle Linux": + when: + distro_name: "ol" + append: +@@ -1243,13 +1254,10 @@ image_types: + - "python3-jsonschema" + - "qemu-guest-agent" + - "redhat-release" +- - "redhat-release-eula" + - "rsync" + - "tar" + - "tcpdump" + - "tuned" +- exclude: +- - "dracut-config-rescue" + conditions: &conditions_subscription_manager_cockpit + "add subscription-manager-cockpit on rhel": + when: +@@ -1257,6 +1265,20 @@ image_types: + append: + include: + - "subscription-manager-cockpit" ++ "include dracut-config-rescue for ol": ++ when: ++ distro_name: "ol" ++ append: ++ include: ++ - "dracut-config-rescue" ++ "include pkgs needed for not oracle linux": ++ when: ++ not_distro_name: "ol" ++ append: ++ include: ++ - "redhat-release-eula" ++ exclude: ++ - "dracut-config-rescue" + + qcow2: &qcow2 + name_aliases: ["guest-image"] +@@ -1318,7 +1340,6 @@ image_types: + - "python3-jsonschema" + - "qemu-guest-agent" + - "redhat-release" +- - "redhat-release-eula" + - "rsync" + - "tar" + - "tuned" +@@ -1357,6 +1378,10 @@ image_types: + - "libertas-sd8787-firmware" + - "nss" + - "plymouth" ++ - "rhn-check" ++ - "rhn-setup" ++ - "rhnsd" ++ - "dnf-plugin-spacewalk" + - "rng-tools" + - "udisks2" + conditions: &conditions_pkgsets_insigths_pkgs +@@ -1367,6 +1392,12 @@ image_types: + include: + - "insights-client" + - "subscription-manager-cockpit" ++ "include redhat-release-eula for not oracle linux": ++ when: ++ not_distro_name: "ol" ++ append: ++ include: ++ - "redhat-release-eula" + + "vagrant-libvirt": &vagrant_libvirt + <<: *qcow2 +-- +2.47.3 + diff --git a/SOURCES/1005-Increase-support-for-OCI-images.patch b/SOURCES/1005-Increase-support-for-OCI-images.patch new file mode 100644 index 0000000..7443ab8 --- /dev/null +++ b/SOURCES/1005-Increase-support-for-OCI-images.patch @@ -0,0 +1,452 @@ +From 230b34d77af5f085fd98a7a276292b6ff53e09ac Mon Sep 17 00:00:00 2001 +From: Josue David Hernandez Gutierrez +Date: Fri, 17 Oct 2025 01:03:57 +0000 +Subject: [PATCH 05/10] Increase support for OCI images + +Add support for OCI images: +- Support for OCI hybrid images +- Add selinux auto-relabeling during first boot +- Support dnf variables inside OCI built images + +Signed-off-by: Josue David Hernandez Gutierrez +--- + .../data/distrodefs/rhel-8/imagetypes.yaml | 167 ++++++++++++++++- + .../data/distrodefs/rhel-9/imagetypes.yaml | 171 +++++++++++++++++- + .../images/pkg/distro/generic/images.go | 4 + + .../osbuild/images/pkg/distro/image_config.go | 1 + + .../osbuild/images/pkg/manifest/os.go | 11 +- + 5 files changed, 351 insertions(+), 3 deletions(-) + +diff --git a/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml b/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml +index a8be32a..884f42e 100644 +--- a/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml ++++ b/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml +@@ -1480,7 +1480,7 @@ image_types: + - <<: *s390x_zipl_platform + image_format: "qcow2" + qcow2_compat: "0.10" +- image_config: ++ image_config: &qcow2_image_config + default_target: "multi-user.target" + kernel_options: + - "console=tty0" +@@ -2402,6 +2402,171 @@ image_types: + - <<: *x86_64_bios_platform + image_format: "qcow2" + qcow2_compat: "0.10" ++ image_config: ++ <<: *qcow2_image_config ++ default_target: "multi-user.target" ++ selinux_force_relabel: true ++ hostonly: true ++ kernel_options: ++ - "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" ++ files: ++ - path: &early-oci-setup "/sbin/early-oci-setup" ++ user: "root" ++ group: "root" ++ mode: 0700 ++ data: | ++ #!/usr/bin/env bash ++ arch=$(uname -m) ++ ++ imds_domain=$(curl -H "Authorization:Bearer Oracle" -sfm 25 http://169.254.169.254/opc/v2/instance/ 2>/dev/null | jq -r '.regionInfo.realmDomainComponent') ++ imds_region=$(curl -H "Authorization:Bearer Oracle" -sfm 25 http://169.254.169.254/opc/v2/instance/ 2>/dev/null | jq -r '.regionInfo.regionIdentifier') ++ imds_realm=$(curl -H "Authorization:Bearer Oracle" -sfm 25 http://169.254.169.254/opc/v2/instance/ 2>/dev/null | jq -r '.regionInfo.realmKey') ++ ++ function retry_command() { ++ ++ retry_attempts=5 ++ retry_interval_sec=2 ++ while [[ "$retry_attempts" -gt 0 ]]; do ++ command_success=true ++ "$@" || { command_success=false; } ++ if [[ "$command_success" == false ]]; then ++ (( retry_attempts-- )) ++ logger -t earlyocisetup "Error occurred running command $@. Will retry in $retry_interval_sec seconds" ++ sleep $retry_interval_sec ++ else ++ break ++ fi ++ done ++ ++ if [[ "$command_success" == false ]]; then ++ logger -t earlyocisetup "ERROR: failed to execute command '$@' (Retried $retry_attempts times)" ++ exit 1 ++ fi ++ } ++ ++ if [[ -n "$imds_realm" ]]; then ++ domain="oci.$imds_domain" ++ region="$imds_region" ++ ociregion=".$region" ++ reponame="oci_install" ++ repourl="https://yum$ociregion.$domain/repo/OracleLinux/OL8/oci/included/$arch/" ++ else ++ logger -t earlyocisetup 'Running out of OCI region' ++ exit 1 ++ fi ++ ++ echo $region > /etc/dnf/vars/region ++ echo $domain > /etc/dnf/vars/ocidomain ++ echo $ociregion > /etc/dnf/vars/ociregion ++ ++ cat < /etc/yum.repos.d/oci-install.repo ++ [$reponame] ++ name=Install OCI repo ($arch) ++ baseurl=$repourl ++ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle ++ gpgcheck=1 ++ enabled=1 ++ EOF ++ ++ retry_command yum install -y oci-included-release-el8 ++ retry_command yum install -y oci-linux-config ++ retry_command yum install -y python36-oci-sdk ++ ++ if $(yum repolist |grep -q "$reponame"); then ++ rm -f /etc/yum.repos.d/oci-install.repo ++ fi ++ ++ mkdir -p /var/lib/oci-repo-installer ++ touch /var/lib/oci-repo-installer/oci-repo-installed ++ ++ rm -f /usr/lib/systemd/system/oci-repo-installer.service /sbin/early-oci-setup ++ systemd_unit: ++ - filename: &oci_repo_installer "oci-repo-installer.service" ++ config: ++ "Unit": ++ Description: "First-boot service for installing oci repository once OCI image has booted" ++ ConditionPathExists: ["!/var/lib/oci-repo-installer/oci-repo-installed"] ++ Requires: ["network-online.target"] ++ "Service": ++ Type: "oneshot" ++ RemainAfterExit: false ++ ExecStart: [*early-oci-setup] ++ "Install": ++ WantedBy: ["network-online.target"] ++ enabled_services: ++ - *oci_repo_installer ++ conditions: ++ "Custom options for x86_64": ++ when: ++ arch: "x86_64" ++ shallow_merge: ++ kernel_options: ++ - "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" ++ - "console=tty0" ++ - "console=ttyS0,115200n8" ++ - "no_timer_check" ++ "Custom options for Aarch64": ++ when: ++ arch: "aarch64" ++ shallow_merge: ++ kernel_options: ++ - "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" ++ - "ro" ++ - "crashkernel=auto" ++ - "LANG=en_US.UTF-8" ++ - "console=ttyAMA0" ++ - "console=ttyAMA0,115200" ++ - "ip=dhcp,dhcp6" ++ package_sets: ++ os: ++ - *qcow2_common_pkgset ++ - include: ++ - "authselect-compat" ++ - "jq" ++ conditions: &condition_rhel_insights_clinet_subman ++ "add insights/subscription manager for copilot": ++ when: ++ distro_name: "rhel" ++ append: ++ include: ++ - "insights-client" ++ - "subscription-manager-cockpit" ++ "include redhat-release-eula for non oracle linux": ++ when: ++ not_distro_name: "ol" ++ append: ++ include: ++ - "redhat-release-eula" + + openstack: + <<: *qcow2 +diff --git a/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml b/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml +index fa3f916..927ad16 100644 +--- a/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml ++++ b/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml +@@ -1317,7 +1317,8 @@ image_types: + <<: *default_partition_tables + package_sets: + os: +- - include: ++ - &qcow2_package_sets ++ include: + - "@core" + - "authselect-compat" + - "chrony" +@@ -1442,6 +1443,174 @@ image_types: + platforms: + - <<: *x86_64_bios_platform + image_format: "qcow2" ++ image_config: ++ <<: *qcow2_image_config ++ default_target: "multi-user.target" ++ selinux_force_relabel: true ++ hostonly: true ++ kernel_options: ++ - "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" ++ files: ++ - path: &early-oci-setup "/sbin/early-oci-setup" ++ user: "root" ++ group: "root" ++ mode: 0700 ++ data: | ++ #!/usr/bin/env bash ++ arch=$(uname -m) ++ ++ imds_domain=$(curl -H "Authorization:Bearer Oracle" -sfm 25 http://169.254.169.254/opc/v2/instance/ 2>/dev/null | jq -r '.regionInfo.realmDomainComponent') ++ imds_region=$(curl -H "Authorization:Bearer Oracle" -sfm 25 http://169.254.169.254/opc/v2/instance/ 2>/dev/null | jq -r '.regionInfo.regionIdentifier') ++ imds_realm=$(curl -H "Authorization:Bearer Oracle" -sfm 25 http://169.254.169.254/opc/v2/instance/ 2>/dev/null | jq -r '.regionInfo.realmKey') ++ ++ function retry_command() { ++ ++ retry_attempts=5 ++ retry_interval_sec=2 ++ while [[ "$retry_attempts" -gt 0 ]]; do ++ command_success=true ++ "$@" || { command_success=false; } ++ if [[ "$command_success" == false ]]; then ++ (( retry_attempts-- )) ++ logger -t earlyocisetup "Error occurred running command $@. Will retry in $retry_interval_sec seconds" ++ sleep $retry_interval_sec ++ else ++ break ++ fi ++ done ++ ++ if [[ "$command_success" == false ]]; then ++ logger -t earlyocisetup "ERROR: failed to execute command '$@' (Retried $retry_attempts times)" ++ exit 1 ++ fi ++ } ++ ++ if [[ -n "$imds_realm" ]]; then ++ domain="oci.$imds_domain" ++ region="$imds_region" ++ ociregion=".$region" ++ reponame="oci_install" ++ repourl="https://yum$ociregion.$domain/repo/OracleLinux/OL9/oci/included/$arch/" ++ else ++ logger -t earlyocisetup 'Running out of OCI region' ++ exit 1 ++ fi ++ ++ echo $region > /etc/dnf/vars/region ++ echo $domain > /etc/dnf/vars/ocidomain ++ echo $ociregion > /etc/dnf/vars/ociregion ++ ++ cat < /etc/yum.repos.d/oci-install.repo ++ [$reponame] ++ name=Install OCI repo ($arch) ++ baseurl=$repourl ++ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle ++ gpgcheck=1 ++ enabled=1 ++ EOF ++ ++ retry_command yum install -y oci-included-release-el9 ++ retry_command yum install -y oci-linux-config ++ retry_command yum install -y python39-oci-sdk ++ ++ if $(yum repolist |grep -q "$reponame"); then ++ rm -f /etc/yum.repos.d/oci-install.repo ++ fi ++ ++ mkdir -p /var/lib/oci-repo-installer ++ touch /var/lib/oci-repo-installer/oci-repo-installed ++ ++ rm -f /usr/lib/systemd/system/oci-repo-installer.service /sbin/early-oci-setup ++ systemd_unit: ++ - filename: &oci_repo_installer "oci-repo-installer.service" ++ config: ++ "Unit": ++ Description: "First-boot service for installing oci repository once OCI image has booted" ++ ConditionPathExists: ["!/var/lib/oci-repo-installer/oci-repo-installed"] ++ Requires: ["network-online.target"] ++ "Service": ++ Type: "oneshot" ++ RemainAfterExit: false ++ ExecStart: [*early-oci-setup] ++ "Install": ++ WantedBy: ["network-online.target"] ++ enabled_services: ++ - *oci_repo_installer ++ conditions: ++ "Custom options for x86_64": ++ when: ++ arch: "x86_64" ++ shallow_merge: ++ kernel_options: ++ - "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" ++ - "console=tty0" ++ - "console=ttyS0,115200n8" ++ - "no_timer_check" ++ "Custom options for Aarch64": ++ when: ++ arch: "aarch64" ++ shallow_merge: ++ kernel_options: ++ - "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" ++ - "ro" ++ - "crashkernel=auto" ++ - "LANG=en_US.UTF-8" ++ - "console=ttyAMA0" ++ - "console=ttyAMA0,115200" ++ - "ip=dhcp,dhcp6" ++ package_sets: ++ os: ++ - *qcow2_package_sets ++ - conditions: &conditions_pkgsets_insigths_pkgs ++ "add insights pkgs on rhel": ++ when: ++ distro_name: "rhel" ++ append: ++ include: ++ - "insights-client" ++ - "subscription-manager-cockpit" ++ "include redhat-release-eula for not oracle linux": ++ when: ++ not_distro_name: "ol" ++ append: ++ include: ++ - "redhat-release-eula" ++ "Add iscsi package": ++ when: ++ distro_name: "ol" ++ append: ++ include: ++ - "iscsi-initiator-utils" + + vhd: &vhd + <<: *qcow2 +diff --git a/vendor/github.com/osbuild/images/pkg/distro/generic/images.go b/vendor/github.com/osbuild/images/pkg/distro/generic/images.go +index 3c088ee..7ca3fec 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/generic/images.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/generic/images.go +@@ -68,6 +68,10 @@ func osCustomizations(t *imageType, osPackageSet rpmmd.PackageSet, options distr + osc.ExcludeDocs = *imageConfig.ExcludeDocs + } + ++ if imageConfig.Hostonly != nil { ++ osc.Hostonly = *imageConfig.Hostonly ++ } ++ + if !t.ImageTypeYAML.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/image_config.go b/vendor/github.com/osbuild/images/pkg/distro/image_config.go +index 7c3289a..9b7d60e 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/image_config.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/image_config.go +@@ -93,6 +93,7 @@ type ImageConfig struct { + + Files []*fsnode.File + Directories []*fsnode.Directory ++ Hostonly *bool `yaml:"hostonly,omitempty"` + + // KernelOptionsBootloader controls whether kernel command line options + // should be specified in the bootloader grubenv configuration. Otherwise +diff --git a/vendor/github.com/osbuild/images/pkg/manifest/os.go b/vendor/github.com/osbuild/images/pkg/manifest/os.go +index dc3365f..03e8c71 100644 +--- a/vendor/github.com/osbuild/images/pkg/manifest/os.go ++++ b/vendor/github.com/osbuild/images/pkg/manifest/os.go +@@ -160,7 +160,8 @@ type OSCustomizations struct { + + CACerts []string + +- FIPS bool ++ FIPS bool ++ Hostonly bool + + // NoBLS configures the image bootloader with traditional menu entries + // instead of BLS. Required for legacy systems like RHEL 7. +@@ -733,6 +734,14 @@ func (p *OS) serialize() osbuild.Pipeline { + pipeline.AddStage(osbuild.NewUdevRulesStage(p.OSCustomizations.UdevRules)) + } + ++ if p.OSCustomizations.Hostonly { ++ pipeline.AddStage(osbuild.NewDracutStage(&osbuild.DracutStageOptions{ ++ Kernel: []string{p.kernelVer}, ++ EarlyMicrocode: true, ++ Reproducible: true, ++ })) ++ } ++ + if pt := p.PartitionTable; pt != nil { + rootUUID, kernelOptions, err := osbuild.GenImageKernelOptions(p.PartitionTable, p.OSCustomizations.MountUnits) + if err != nil { +-- +2.47.3 + diff --git a/SOURCES/1006-Increase-default-boot-size-to-1GB.patch b/SOURCES/1006-Increase-default-boot-size-to-1GB.patch new file mode 100644 index 0000000..ac97739 --- /dev/null +++ b/SOURCES/1006-Increase-default-boot-size-to-1GB.patch @@ -0,0 +1,27 @@ +From 590db7f513259fe653519e0182b4dda6685b76be Mon Sep 17 00:00:00 2001 +From: Josue David Hernandez Gutierrez +Date: Wed, 1 Oct 2025 01:28:46 +0000 +Subject: [PATCH 06/10] Increase default /boot size to 1GB + +Signed-off-by: Josue David Hernandez Gutierrez +Signed-off-by: Alex Burmashev +--- + vendor/github.com/osbuild/images/pkg/disk/partition_table.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +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 6cf353b..0eea1fb 100644 +--- a/vendor/github.com/osbuild/images/pkg/disk/partition_table.go ++++ b/vendor/github.com/osbuild/images/pkg/disk/partition_table.go +@@ -648,7 +648,7 @@ func clampFSSize(mountpoint string, size uint64) uint64 { + var minSize uint64 = 1073741824 + + if mountpoint == "/boot" { +- minSize = 524288000 ++ minSize = 1073741824 + } + + if minSize > size { +-- +2.47.3 + diff --git a/SOURCES/1007-Support-using-repository-definitions-with-OCI-variab.patch b/SOURCES/1007-Support-using-repository-definitions-with-OCI-variab.patch new file mode 100644 index 0000000..a2d5943 --- /dev/null +++ b/SOURCES/1007-Support-using-repository-definitions-with-OCI-variab.patch @@ -0,0 +1,85 @@ +From 74d061ee407e4a99a81c8a5ef4029ea07586be40 Mon Sep 17 00:00:00 2001 +From: Josue David Hernandez Gutierrez +Date: Thu, 21 Aug 2025 23:11:32 +0000 +Subject: [PATCH 07/10] Support using repository definitions with OCI + variables. + +We can use repository definitions in a format, more similar to generic Oracle repositories +with DNF vars. +Essentially in osbuild-composer log when parsing repos, we at first parse variables, then process +original repo file in memory and replace vars with their values and write modified repo to buffer. +After that we use buffer to actually populate repository data. + +If we have failed to read ocidomain, which is the key variable, we fallback to values to generic public repos. + +Signed-off-by: Alex Burmashev +Signed-off-by: Josue David Hernandez Gutierrez +--- + .../osbuild/images/pkg/rpmmd/repository.go | 42 ++++++++++++++++++- + 1 file changed, 41 insertions(+), 1 deletion(-) + +diff --git a/vendor/github.com/osbuild/images/pkg/rpmmd/repository.go b/vendor/github.com/osbuild/images/pkg/rpmmd/repository.go +index bcad415..a04548a 100644 +--- a/vendor/github.com/osbuild/images/pkg/rpmmd/repository.go ++++ b/vendor/github.com/osbuild/images/pkg/rpmmd/repository.go +@@ -10,6 +10,8 @@ import ( + "strings" + "time" + ++ "bufio" ++ "bytes" + "github.com/gobwas/glob" + ) + +@@ -276,9 +278,47 @@ func LoadRepositoriesFromFile(filename string) (map[string][]RepoConfig, error) + func LoadRepositoriesFromReader(r io.Reader) (map[string][]RepoConfig, error) { + var reposMap map[string][]repository + repoConfigs := make(map[string][]RepoConfig) ++ var ocidomain, ociregion, region []byte + +- err := json.NewDecoder(r).Decode(&reposMap) ++ var OCIlines []string ++ ocidomain = []byte("oracle.com") ++ ociregion = []byte("") ++ region = []byte("") ++ ++ ociregion, err := os.ReadFile("/etc/dnf/vars/ociregion") ++ if err != nil { ++ fmt.Println("Error while reading file: /etc/dnf/vars/ociregion") ++ } ++ region, err = os.ReadFile("/etc/dnf/vars/region") ++ if err != nil { ++ fmt.Println("Error while reading file: /etc/dnf/vars/region") ++ } ++ ocidomain, err = os.ReadFile("/etc/dnf/vars/ocidomain") ++ if err != nil { ++ fmt.Println("Error while reading file: /etc/dnf/vars/ocidomain") ++ } ++ if ocidomain == nil { ++ ocidomain = []byte("oracle.com") ++ ociregion = []byte("") ++ } ++ scanner := bufio.NewScanner(r) ++ OCIreplacer := strings.NewReplacer("$ocidomain", strings.TrimSuffix(string(ocidomain), "\n"), "$ociregion", strings.TrimSuffix(string(ociregion), "\n"), "$region", strings.TrimSuffix(string(region), "\n")) ++ for scanner.Scan() { ++ line := scanner.Text() ++ OCIline := OCIreplacer.Replace(line) ++ OCIlines = append(OCIlines, OCIline) ++ continue ++ } ++ if err := scanner.Err(); err != nil { ++ panic(err) ++ } ++ fOCI := strings.Join(OCIlines, "\n") ++ ++ buf := new(bytes.Buffer) ++ fmt.Fprint(buf, fOCI) ++ err = json.NewDecoder(buf).Decode(&reposMap) + if err != nil { ++ fmt.Println("Error parsing the repo") + return nil, err + } + +-- +2.47.3 + diff --git a/SOURCES/1008-Update-Oracle-repositories-to-contain-OCI-variables.patch b/SOURCES/1008-Update-Oracle-repositories-to-contain-OCI-variables.patch new file mode 100644 index 0000000..0699319 --- /dev/null +++ b/SOURCES/1008-Update-Oracle-repositories-to-contain-OCI-variables.patch @@ -0,0 +1,121 @@ +From b9bcc3182f6c161e1f8efc36bae355fe0ba55e8a Mon Sep 17 00:00:00 2001 +From: Josue David Hernandez Gutierrez +Date: Fri, 17 Oct 2025 01:07:21 +0000 +Subject: [PATCH 08/10] Update Oracle repositories to contain OCI variables + +We now support oci variables for osbuild-composer, so let's actually use them. + +Signed-off-by: Alex Burmashev +Signed-off-by: Josue David Hernandez Gutierrez +--- + .../osbuild/images/data/repositories/ol-810.json | 12 ++++++------ + .../osbuild/images/data/repositories/ol-96.json | 12 ++++++------ + 2 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/vendor/github.com/osbuild/images/data/repositories/ol-810.json b/vendor/github.com/osbuild/images/data/repositories/ol-810.json +index a23b3c6..e8cffe7 100644 +--- a/vendor/github.com/osbuild/images/data/repositories/ol-810.json ++++ b/vendor/github.com/osbuild/images/data/repositories/ol-810.json +@@ -2,19 +2,19 @@ + "aarch64": [ + { + "name": "baseos", +- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/baseos/latest/aarch64", ++ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/baseos/latest/aarch64", + "check_gpg": false, + "rhsm": false + }, + { + "name": "uekr7", +- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/UEKR7/aarch64/", ++ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/UEKR7/aarch64/", + "check_gpg": false, + "rhsm": false + }, + { + "name": "appstream", +- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/appstream/aarch64", ++ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/appstream/aarch64", + "check_gpg": false, + "rhsm": false + } +@@ -22,19 +22,19 @@ + "x86_64": [ + { + "name": "baseos", +- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/baseos/latest/x86_64", ++ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/baseos/latest/x86_64", + "check_gpg": false, + "rhsm": false + }, + { + "name": "uekr7", +- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/UEKR7/x86_64/", ++ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/UEKR7/x86_64/", + "check_gpg": false, + "rhsm": false + }, + { + "name": "appstream", +- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/appstream/x86_64", ++ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/appstream/x86_64", + "check_gpg": false, + "rhsm": false + } +diff --git a/vendor/github.com/osbuild/images/data/repositories/ol-96.json b/vendor/github.com/osbuild/images/data/repositories/ol-96.json +index 2a9608a..ace1e38 100644 +--- a/vendor/github.com/osbuild/images/data/repositories/ol-96.json ++++ b/vendor/github.com/osbuild/images/data/repositories/ol-96.json +@@ -2,21 +2,21 @@ + "aarch64": [ + { + "name": "baseos", +- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/aarch64", ++ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/baseos/latest/aarch64", + "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", + "check_gpg": true, + "rhsm": false + }, + { + "name": "uekr8", +- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/UEKR8/aarch64/", ++ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/UEKR8/aarch64/", + "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", + "check_gpg": true, + "rhsm": false + }, + { + "name": "appstream", +- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/appstream/aarch64", ++ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/appstream/aarch64", + "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", + "check_gpg": true, + "rhsm": false +@@ -25,21 +25,21 @@ + "x86_64": [ + { + "name": "baseos", +- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/x86_64", ++ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/baseos/latest/x86_64", + "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", + "check_gpg": true, + "rhsm": false + }, + { + "name": "uekr8", +- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/UEKR8/x86_64/", ++ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/UEKR8/x86_64/", + "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", + "check_gpg": true, + "rhsm": false + }, + { + "name": "appstream", +- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/appstream/x86_64", ++ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/appstream/x86_64", + "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", + "check_gpg": true, + "rhsm": false +-- +2.47.3 + diff --git a/SOURCES/1009-Simplify-repo-name-removing-minor-versions.patch b/SOURCES/1009-Simplify-repo-name-removing-minor-versions.patch new file mode 100644 index 0000000..cee870a --- /dev/null +++ b/SOURCES/1009-Simplify-repo-name-removing-minor-versions.patch @@ -0,0 +1,79 @@ +From 427bf53bee2421b7c7888563334dfd3eae2e1b34 Mon Sep 17 00:00:00 2001 +From: Josue David Hernandez Gutierrez +Date: Fri, 17 Oct 2025 01:11:18 +0000 +Subject: [PATCH 09/10] Simplify repo name removing minor versions + +Rename ol-810.json to ol-8.json and ol-96.json to ol-9.json + +Signed-off-by: Josue David Hernandez Gutierrez +--- + .../osbuild/images/data/distrodefs/distros.yaml | 12 ++++++------ + .../data/repositories/{ol-810.json => ol-8.json} | 0 + .../data/repositories/{ol-96.json => ol-9.json} | 0 + vendor/github.com/osbuild/images/pkg/distro/host.go | 8 ++++++++ + 4 files changed, 14 insertions(+), 6 deletions(-) + rename vendor/github.com/osbuild/images/data/repositories/{ol-810.json => ol-8.json} (100%) + rename vendor/github.com/osbuild/images/data/repositories/{ol-96.json => ol-9.json} (100%) + +diff --git a/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml b/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml +index 8fe4340..3be8b8f 100644 +--- a/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml ++++ b/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml +@@ -259,10 +259,10 @@ distros: + + - &ol9 + <<: *rhel9 +- name: "ol-{{.MajorVersion}}.{{.MinorVersion}}" +- match: '(?Pol)-(?P9)\.?(?P[0-9]{1,2})' ++ name: "ol-{{.MajorVersion}}" ++ match: '(?Pol)-(?P9)' + product: "Oracle Linux" +- os_version: "{{.MajorVersion}}.{{.MinorVersion}}" ++ os_version: "{{.MajorVersion}}" + release_version: 9 + module_platform_id: "platform:el9" + vendor: "redhat" +@@ -389,10 +389,10 @@ distros: + + - &ol8 + <<: *rhel8 +- name: "ol-{{.MajorVersion}}.{{.MinorVersion}}" +- match: '(?Pol)-(?P8)\.?(?P[0-9]{1,2})' ++ name: "ol-{{.MajorVersion}}" ++ match: '(?Pol)-(?P8)' + product: "Oracle Linux" +- os_version: "{{.MajorVersion}}.{{.MinorVersion}}" ++ os_version: "{{.MajorVersion}}" + release_version: 8 + module_platform_id: "platform:el8" + vendor: "redhat" +diff --git a/vendor/github.com/osbuild/images/data/repositories/ol-810.json b/vendor/github.com/osbuild/images/data/repositories/ol-8.json +similarity index 100% +rename from vendor/github.com/osbuild/images/data/repositories/ol-810.json +rename to vendor/github.com/osbuild/images/data/repositories/ol-8.json +diff --git a/vendor/github.com/osbuild/images/data/repositories/ol-96.json b/vendor/github.com/osbuild/images/data/repositories/ol-9.json +similarity index 100% +rename from vendor/github.com/osbuild/images/data/repositories/ol-96.json +rename to vendor/github.com/osbuild/images/data/repositories/ol-9.json +diff --git a/vendor/github.com/osbuild/images/pkg/distro/host.go b/vendor/github.com/osbuild/images/pkg/distro/host.go +index db1aaea..1c5c6c4 100644 +--- a/vendor/github.com/osbuild/images/pkg/distro/host.go ++++ b/vendor/github.com/osbuild/images/pkg/distro/host.go +@@ -62,6 +62,14 @@ func GetHostDistroName() (string, error) { + } + } + ++ if osrelease["ID"] == "ol" { ++ versionParts := strings.Split(osrelease["VERSION_ID"], ".") ++ if len(versionParts) < 2 { ++ return "", errors.New("failed to parse version from os-release, not enough dotted parts") ++ } ++ return osrelease["ID"] + "-" + versionParts[0], nil ++ } ++ + name := osrelease["ID"] + "-" + osrelease["VERSION_ID"] + + return name, nil +-- +2.47.3 + diff --git a/SOURCES/1010-Oscap-customization-for-Oracle-Linux.patch b/SOURCES/1010-Oscap-customization-for-Oracle-Linux.patch new file mode 100644 index 0000000..c2ff370 --- /dev/null +++ b/SOURCES/1010-Oscap-customization-for-Oracle-Linux.patch @@ -0,0 +1,85 @@ +From 28357b3753a97ceff6fa491745116ca84521fe98 Mon Sep 17 00:00:00 2001 +From: Josue David Hernandez Gutierrez +Date: Fri, 17 Oct 2025 01:15:38 +0000 +Subject: [PATCH 10/10] Oscap customization for Oracle Linux + +Signed-off-by: Josue David Hernandez Gutierrez +--- + .../images/data/distrodefs/rhel-8/imagetypes.yaml | 5 +++++ + .../images/data/distrodefs/rhel-9/imagetypes.yaml | 5 +++++ + .../images/pkg/customizations/oscap/oscap.go | 14 ++++++++++---- + 3 files changed, 20 insertions(+), 4 deletions(-) + +diff --git a/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml b/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml +index 67a189d..af6a4bf 100644 +--- a/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml ++++ b/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml +@@ -1251,6 +1251,11 @@ image_config: + distro_name: "centos" + shallow_merge: + default_oscap_datastream: "/usr/share/xml/scap/ssg/content/ssg-centos8-ds.xml" ++ "oscap needs a different path on Oracle linux": ++ when: ++ distro_name: "ol" ++ shallow_merge: ++ default_oscap_datastream: "/usr/share/xml/scap/ssg/content/ssg-ol8-ds.xml" + + image_types: + # XXX: not a real pkgset but the "os" pipeline pkgset for image-installer +diff --git a/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml b/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml +index ca61d0d..78735c7 100644 +--- a/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml ++++ b/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml +@@ -1213,6 +1213,11 @@ image_config: + distro_name: "centos" + shallow_merge: + default_oscap_datastream: "/usr/share/xml/scap/ssg/content/ssg-cs9-ds.xml" ++ "oscap needs a different path on Oracle linux": ++ when: ++ distro_name: "ol" ++ shallow_merge: ++ default_oscap_datastream: "/usr/share/xml/scap/ssg/content/ssg-ol9-ds.xml" + + image_types: + # XXX: not a real pkgset but the "os" pipeline pkgset for image-installer +diff --git a/vendor/github.com/osbuild/images/pkg/customizations/oscap/oscap.go b/vendor/github.com/osbuild/images/pkg/customizations/oscap/oscap.go +index 59fba61..af47a30 100644 +--- a/vendor/github.com/osbuild/images/pkg/customizations/oscap/oscap.go ++++ b/vendor/github.com/osbuild/images/pkg/customizations/oscap/oscap.go +@@ -41,6 +41,8 @@ const ( + defaultCentos8Datastream string = "/usr/share/xml/scap/ssg/content/ssg-centos8-ds.xml" + defaultCentos9Datastream string = "/usr/share/xml/scap/ssg/content/ssg-cs9-ds.xml" + defaultCentos10Datastream string = "/usr/share/xml/scap/ssg/content/ssg-cs10-ds.xml" ++ defaultOL8Datastream string = "/usr/share/xml/scap/ssg/content/ssg-ol8-ds.xml" ++ defaultOL9Datastream string = "/usr/share/xml/scap/ssg/content/ssg-ol9-ds.xml" + defaultRHEL8Datastream string = "/usr/share/xml/scap/ssg/content/ssg-rhel8-ds.xml" + defaultRHEL9Datastream string = "/usr/share/xml/scap/ssg/content/ssg-rhel9-ds.xml" + defaultRHEL10Datastream string = "/usr/share/xml/scap/ssg/content/ssg-rhel10-ds.xml" +@@ -127,16 +129,20 @@ func DefaultFedoraDatastream() string { + return defaultFedoraDatastream + } + +-func DefaultRHEL8Datastream(isRHEL bool) string { +- if isRHEL { ++func DefaultRHEL8Datastream(name string) string { ++ if strings.HasPrefix(name, "rhel") { + return defaultRHEL8Datastream ++ } else if strings.HasPrefix(name, "ol") { ++ return defaultOL8Datastream + } + return defaultCentos8Datastream + } + +-func DefaultRHEL9Datastream(isRHEL bool) string { +- if isRHEL { ++func DefaultRHEL9Datastream(name string) string { ++ if strings.HasPrefix(name, "rhel") { + return defaultRHEL9Datastream ++ } else if strings.HasPrefix(name, "ol") { ++ return defaultOL9Datastream + } + return defaultCentos9Datastream + } +-- +2.47.3 + diff --git a/SOURCES/enable-bsi-oscap-profile.patch b/SOURCES/enable-bsi-oscap-profile.patch new file mode 100644 index 0000000..85c238c --- /dev/null +++ b/SOURCES/enable-bsi-oscap-profile.patch @@ -0,0 +1,74 @@ +From 73a42cc3647a13a548d768fd31fd53d89e0546d4 Mon Sep 17 00:00:00 2001 +From: Gianluca Zuccarelli +Date: Tue, 7 Oct 2025 12:53:39 +0100 +Subject: [PATCH] go.mod: bump images to v0.178.1 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Changes with 0.178.1 +---------------- +distrodefs: enable bsi oscap profile for RHEL-9.7 (HMS-9458) (#1917) +Author: Gianluca Zuccarelli, Reviewers: Achilleas Koutsou, Michael Vogt, Simon de Vlieger + +— Somewhere on the Internet, 2025-10-07 +--- + go.mod | 2 +- + go.sum | 4 ++-- + vendor/github.com/osbuild/images/data/distrodefs/distros.yaml | 1 + + vendor/modules.txt | 2 +- + 4 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/go.mod b/go.mod +index 1965315d45..d3ba6fd003 100644 +--- a/go.mod ++++ b/go.mod +@@ -34,7 +34,7 @@ require ( + github.com/oapi-codegen/runtime v1.1.2 + github.com/openshift-online/ocm-sdk-go v0.1.473 + github.com/osbuild/blueprint v1.13.0 +- github.com/osbuild/images v0.178.0 ++ github.com/osbuild/images v0.178.1 + github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20240814102216-0239db53236d + github.com/prometheus/client_golang v1.23.0 + github.com/segmentio/ksuid v1.0.4 +diff --git a/go.sum b/go.sum +index 843668bc90..11dab7a752 100644 +--- a/go.sum ++++ b/go.sum +@@ -517,8 +517,8 @@ github.com/oracle/oci-go-sdk/v54 v54.0.0 h1:CDLjeSejv2aDpElAJrhKpi6zvT/zhZCZuXch + github.com/oracle/oci-go-sdk/v54 v54.0.0/go.mod h1:+t+yvcFGVp+3ZnztnyxqXfQDsMlq8U25faBLa+mqCMc= + github.com/osbuild/blueprint v1.13.0 h1:blo22+S2ZX5bBmjGcRveoTUrV4Ms7kLfKyb32WyuymA= + github.com/osbuild/blueprint v1.13.0/go.mod h1:HPlJzkEl7q5g8hzaGksUk7ifFAy9QFw9LmzhuFOAVm4= +-github.com/osbuild/images v0.178.0 h1:ojCD1rRtO+khFHpRHUxd6ydXBarEu+6pwt0w8oqilaY= +-github.com/osbuild/images v0.178.0/go.mod h1:7CfDwGb8YA4erIzvMnqJysVpSu52i6l/f3h82usGPTg= ++github.com/osbuild/images v0.178.1 h1:tHRAc+nS5TLlEWXb4YHbTUID4GbGCf1XIRJkTx8aQOs= ++github.com/osbuild/images v0.178.1/go.mod h1:7CfDwGb8YA4erIzvMnqJysVpSu52i6l/f3h82usGPTg= + github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20240814102216-0239db53236d h1:r9BFPDv0uuA9k1947Jybcxs36c/pTywWS1gjeizvtcQ= + github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20240814102216-0239db53236d/go.mod h1:zR1iu/hOuf+OQNJlk70tju9IqzzM4ycq0ectkFBm94U= + github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s= +diff --git a/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml b/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml +index f1d3dab247..53b6bd6599 100644 +--- a/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml ++++ b/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml +@@ -214,6 +214,7 @@ distros: + - "xccdf_org.ssgproject.content_profile_anssi_bp28_high" + - "xccdf_org.ssgproject.content_profile_anssi_bp28_intermediary" + - "xccdf_org.ssgproject.content_profile_anssi_bp28_minimal" ++ - "xccdf_org.ssgproject.content_profile_bsi" + - "xccdf_org.ssgproject.content_profile_ccn_advanced" + - "xccdf_org.ssgproject.content_profile_ccn_basic" + - "xccdf_org.ssgproject.content_profile_ccn_intermediate" +diff --git a/vendor/modules.txt b/vendor/modules.txt +index 8356ae0466..617aa979c6 100644 +--- a/vendor/modules.txt ++++ b/vendor/modules.txt +@@ -958,7 +958,7 @@ github.com/oracle/oci-go-sdk/v54/workrequests + ## explicit; go 1.23.9 + github.com/osbuild/blueprint/internal/common + github.com/osbuild/blueprint/pkg/blueprint +-# github.com/osbuild/images v0.178.0 ++# github.com/osbuild/images v0.178.1 + ## explicit; go 1.23.9 + github.com/osbuild/images/data/dependencies + github.com/osbuild/images/data/distrodefs diff --git a/SPECS/osbuild-composer.spec b/SPECS/osbuild-composer.spec index 98b8267..b5172c9 100644 --- a/SPECS/osbuild-composer.spec +++ b/SPECS/osbuild-composer.spec @@ -12,7 +12,7 @@ %global goipath github.com/osbuild/osbuild-composer -Version: 149 +Version: 149 %gometa @@ -25,43 +25,56 @@ It is compatible with composer-cli and cockpit-composer clients. } Name: osbuild-composer -Release: 1%{?dist} +Release: 2.0.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: enable-bsi-oscap-profile.patch + +Patch1001: 1001-Add-repositories-for-OL-8.10-and-OL-9.6.patch +Patch1002: 1002-Add-support-for-OL-on-osbuild-composer.patch +Patch1003: 1003-Removing-non-supported-image-types.patch +Patch1004: 1004-Fix-packageSets.patch +Patch1005: 1005-Increase-support-for-OCI-images.patch +Patch1006: 1006-Increase-default-boot-size-to-1GB.patch +Patch1007: 1007-Support-using-repository-definitions-with-OCI-variab.patch +Patch1008: 1008-Update-Oracle-repositories-to-contain-OCI-variables.patch +Patch1009: 1009-Simplify-repo-name-removing-minor-versions.patch +Patch1010: 1010-Oscap-customization-for-Oracle-Linux.patch -BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} -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} @@ -155,6 +168,15 @@ install -m 0644 -vp vendor/github.com/osbuild/images/data/repositories/centos-%{ cp -a repositories/centos-stream-%{centos}* %{buildroot}%{_datadir}/osbuild-composer/repositories/ %endif +%else +%if 0%{?oraclelinux} +%if 0%{?oraclelinux} >= 9 +install -m 0644 -vp vendor/github.com/osbuild/images/data/repositories/ol-* %{buildroot}%{_datadir}/osbuild-composer/repositories/ +%else +install -m 0644 -vp vendor/github.com/osbuild/images/data/repositories/ol-%{oraclelinux}* %{buildroot}%{_datadir}/osbuild-composer/repositories/ + +%endif + %else %if 0%{?rhel} @@ -185,6 +207,7 @@ done %endif %endif %endif +%endif # Fedora can build for all included fedora releases %if 0%{?fedora} @@ -305,13 +328,13 @@ cd $PWD/_build/src/%{goipath} %{_sysusersdir}/osbuild-composer.conf %package core -Summary: The core osbuild-composer binary -Requires: osbuild-depsolve-dnf >= %{min_osbuild_version} +Summary: The core osbuild-composer binary +Requires: osbuild-depsolve-dnf >= %{min_osbuild_version} # This version needs to get bumped everytime the osbuild-depsolve-dnf json # API changes in incompatible ways -Requires: osbuild-dnf-json-api = 8 -Provides: %{name}-dnf-json = %{version}-%{release} -Obsoletes: %{name}-dnf-json < %{version}-%{release} +Requires: osbuild-dnf-json-api = 8 +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. @@ -321,16 +344,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 @@ -362,65 +385,65 @@ 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: 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 # podman-plugins has been deprecated since podman version 5.0.0, # which is in Fedora 40+ and in c10s / el10 %if (0%{?rhel} && 0%{?rhel} < 10) || (0%{?fedora} && 0%{?fedora} < 40) -Requires: podman-plugins +Requires: podman-plugins %endif -Requires: dnf-plugins-core -Requires: skopeo -Requires: make -Requires: python3-pip +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 @@ -434,6 +457,25 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog +* Thu Nov 20 2025 Kevin Lyons - 149-2.0.1 +- Add missing dependency over dracut-config-rescue for image-installer [ORABUG: 38587453] +- Switch to UEKR8 repositories for OL9.6 [Orabug: 37962207] +- Add support to create OpenScap images [JIRA: OLDIS-35301] +- Simplify repository names [JIRA: OLDIS-35893] +- Refactor patches to fix some naming and set a correct kernel for Oracle Linux [Orabug: 37253643] +- Support using OCI variables inside built images [JIRA: OLDIS-35302] +- Support using repository definitons with OCI variables [JIRA: OLDIS-38657] +- Update repositories to contain OCI variables +- Remove image types Minimal-raw and wsl [JIRA: OLDIS-38123] +- Increase default /boot size to 1GB [Orabug: 36827079] +- Add support for OCI hybrid images [JIRA: OLDIS-33593] +- enable aarch64 OCI image builds [JIRA: OLDIS-33593] +- support for building OL8/9 images on Oracle Linux 9 [Orabug: 36400619] + +* Wed Oct 15 2025 Gianluca Zuccarelli - 149-2 +- Add missing BSI OpenSCAP profile to the allowlist + Resolves: RHEL-121525 + * Thu Aug 21 2025 imagebuilder-bot - 149-1 - New upstream release From 1c09e36375d7a0439e052393f7167f3a20303528 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 27 Nov 2025 13:01:55 +0000 Subject: [PATCH 2/2] Revert OL modifications --- ...-repositories-for-OL-8.10-and-OL-9.6.patch | 118 ----- ...d-support-for-OL-on-osbuild-composer.patch | 192 -------- ...3-Removing-non-supported-image-types.patch | 89 ---- SOURCES/1004-Fix-packageSets.patch | 252 ---------- ...1005-Increase-support-for-OCI-images.patch | 452 ------------------ ...06-Increase-default-boot-size-to-1GB.patch | 27 -- ...pository-definitions-with-OCI-variab.patch | 85 ---- ...epositories-to-contain-OCI-variables.patch | 121 ----- ...fy-repo-name-removing-minor-versions.patch | 79 --- ...Oscap-customization-for-Oracle-Linux.patch | 85 ---- SPECS/osbuild-composer.spec | 202 ++++---- 11 files changed, 83 insertions(+), 1619 deletions(-) delete mode 100644 SOURCES/1001-Add-repositories-for-OL-8.10-and-OL-9.6.patch delete mode 100644 SOURCES/1002-Add-support-for-OL-on-osbuild-composer.patch delete mode 100644 SOURCES/1003-Removing-non-supported-image-types.patch delete mode 100644 SOURCES/1004-Fix-packageSets.patch delete mode 100644 SOURCES/1005-Increase-support-for-OCI-images.patch delete mode 100644 SOURCES/1006-Increase-default-boot-size-to-1GB.patch delete mode 100644 SOURCES/1007-Support-using-repository-definitions-with-OCI-variab.patch delete mode 100644 SOURCES/1008-Update-Oracle-repositories-to-contain-OCI-variables.patch delete mode 100644 SOURCES/1009-Simplify-repo-name-removing-minor-versions.patch delete mode 100644 SOURCES/1010-Oscap-customization-for-Oracle-Linux.patch diff --git a/SOURCES/1001-Add-repositories-for-OL-8.10-and-OL-9.6.patch b/SOURCES/1001-Add-repositories-for-OL-8.10-and-OL-9.6.patch deleted file mode 100644 index 51cdfc1..0000000 --- a/SOURCES/1001-Add-repositories-for-OL-8.10-and-OL-9.6.patch +++ /dev/null @@ -1,118 +0,0 @@ -From 3b450033adda7996c8a9eb92bfd057fff0ac5e3e Mon Sep 17 00:00:00 2001 -From: Josue David Hernandez Gutierrez -Date: Wed, 30 Oct 2024 17:08:55 +0000 -Subject: [PATCH 01/10] Add repositories for OL-8.10 and OL-9.6 - -Signed-off-by: Josue David Hernandez Gutierrez ---- - .../images/data/repositories/ol-810.json | 42 ++++++++++++++++ - .../images/data/repositories/ol-96.json | 48 +++++++++++++++++++ - 2 files changed, 90 insertions(+) - create mode 100644 vendor/github.com/osbuild/images/data/repositories/ol-810.json - create mode 100644 vendor/github.com/osbuild/images/data/repositories/ol-96.json - -diff --git a/vendor/github.com/osbuild/images/data/repositories/ol-810.json b/vendor/github.com/osbuild/images/data/repositories/ol-810.json -new file mode 100644 -index 0000000..a23b3c6 ---- /dev/null -+++ b/vendor/github.com/osbuild/images/data/repositories/ol-810.json -@@ -0,0 +1,42 @@ -+{ -+ "aarch64": [ -+ { -+ "name": "baseos", -+ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/baseos/latest/aarch64", -+ "check_gpg": false, -+ "rhsm": false -+ }, -+ { -+ "name": "uekr7", -+ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/UEKR7/aarch64/", -+ "check_gpg": false, -+ "rhsm": false -+ }, -+ { -+ "name": "appstream", -+ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/appstream/aarch64", -+ "check_gpg": false, -+ "rhsm": false -+ } -+ ], -+ "x86_64": [ -+ { -+ "name": "baseos", -+ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/baseos/latest/x86_64", -+ "check_gpg": false, -+ "rhsm": false -+ }, -+ { -+ "name": "uekr7", -+ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/UEKR7/x86_64/", -+ "check_gpg": false, -+ "rhsm": false -+ }, -+ { -+ "name": "appstream", -+ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/appstream/x86_64", -+ "check_gpg": false, -+ "rhsm": false -+ } -+ ] -+} -diff --git a/vendor/github.com/osbuild/images/data/repositories/ol-96.json b/vendor/github.com/osbuild/images/data/repositories/ol-96.json -new file mode 100644 -index 0000000..2a9608a ---- /dev/null -+++ b/vendor/github.com/osbuild/images/data/repositories/ol-96.json -@@ -0,0 +1,48 @@ -+{ -+ "aarch64": [ -+ { -+ "name": "baseos", -+ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/aarch64", -+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", -+ "check_gpg": true, -+ "rhsm": false -+ }, -+ { -+ "name": "uekr8", -+ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/UEKR8/aarch64/", -+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", -+ "check_gpg": true, -+ "rhsm": false -+ }, -+ { -+ "name": "appstream", -+ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/appstream/aarch64", -+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", -+ "check_gpg": true, -+ "rhsm": false -+ } -+ ], -+ "x86_64": [ -+ { -+ "name": "baseos", -+ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/x86_64", -+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGHncu8BEAC2dhocMZkdapnP9o/MvAnKOczaSpF4Cj9yqt49bxLPJCY57jz9\n2ZkJ5iGk6kpBt4rPTh18aAl30T+nPP8VMQjMhvHJKfZmBtaJJ5RpvvpK5mj1UgRJ\n4DQX7gqAbT0s/uZZcouZsJzXo3c7GNMrim1C+ScfGG6BoB6GVBK74jFeJNMsxZ2Y\nBwQhpE+KG+1zD94RZCySykJjNoKj+U4W5H2XdB/mNEc8icFqxjJGZ5BN0DA2Wqxn\nmwELTO3Q2ne1y9+sPn2YKhRqyihuZYaUPR/Jpdki93mk61MdaoTTxFPZ8FWAYrAW\n9KVdreT8K33SaTFFpmhbpndPEYesgCqDqiZG7Ywjgbf2nqSOzBr2ZX23PX7QUCvQ\nar58bNbWENLhC3B950TK+r23kkPa3GICE9WP5TftWJdbJMWRBX3YhdNooNGGCbeB\nxM7B/UV9hSRx1S/US8HvDhJezZDuKrpPXrNWJTuW9Kty2WGwUkEDT2GBbcjx9ocJ\nfqyNJKhaLoYKCVlsmhJUi4xCY0CDDapekWLZOzHB2zgT49uIjawV5ex6pA7oLaPI\nhQGvTcCl7GFWOP/6feazzIpnsJ4V3B2DoLnAevpZlINo/bi3Hv/YmbvE6NyYzD6c\n1y90pc0+Om1trLPCAZpaO1I369ZhLl6T/mCd92hrCG1y8K3PFiRIKpEMVwARAQAB\ntDVPcmFjbGUgTGludXggKHJlbGVhc2Uga2V5IDEpIDxzZWNhbGVydF91c0BvcmFj\nbGUuY29tPokCVAQTAQoAPhYhBD5tgm0/urOJwvOONLxNBqCNi3VvBQJinlnsAhsD\nBQklmAYABQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJELxNBqCNi3Vv3LEP/2au\nkXzbdA/T/7i+4AbGFfYnTWqmZy58wfteDNy1sk6cPmfOUqZQXUrJcSGqqeIDjPvl\nKNExpee/Ja4NGg2YfzkwH5IK5sXmEDKObXRCXGZh9/WyYpr4TBoDU2rSYBP4sbKm\nPsnVoRalt2Zb0qbQF8GilytoRabjI0gLzwhmoHBZMMc3MIO14KQ5yFbekaJZKcxE\nBxaDQ1NDZV1rOVbkg0yDLS9Nw89dDYWVn1wx0foRJcD277ExvmaB4vmC5yayo4ss\ncFldYLu7W9FHmh46flXQGfduORCbDFfjn92eB0jdrkuoEhVRpljAtMO15GMpuVbv\nHzbImI2f1MfydOa6dHbRAlzeV37fPz+1nO9IWdXqFeRG0nrH2gB02AfeoObMkK/a\nXYT9sq1mC5DaK6fbOPWlY+c2hIq0BhUpe+OBdDfmm7L+si9Ffj2sUdn4sHLN6Tj7\nBrJuWmJEz42+rblDNBkrdBC6XXDaRYILKSuGD65PVV+/pVl1c2EOqcktW00iiehb\neLhj2sz6NaoO5Rhx0J3pMsaCaEBAm8P6UxQSx4iGhZ8Kh5O1SVVlqu3xOhSGOKRE\nsS8gIjeV/Jl3frR4eZG/BpzdTjKZmQV7dvJ4gDuDE+X7rZBzUm7nggyE2pV6UbTD\n5Qwy+ASQfYHfHK4lsHD4kbO/We6H1fEFPlzlr14UuQINBGHncu8BEADBG52gWRob\nVEsQIzAfq2obFnwMroxMupXrDBka7i6cUJw8HsqyHs9maGxAuRDlAma2MBPUYcbm\nDH3bmctaUR7CA1RouPkb6qbZXwSwpvgN4eh4naPX20/VEp/cd5DhKWjP9yC70weh\nr4LmGWV41jBAMK0G1l6+FDw2ITgsamZP+tw0swCKqzpIY2waiygCtPHCCCFMuZ6S\n7hzQpsKVFh8zqzRxMs6Mni9olk4+xwng0ahYfoe2esByR2M1kGX62Y6BOcIRX1cE\nzYFCUww5GrjZdJoObBtffUSz+q2LNOBcqg5huRd8BoC+k5yrXUq8ypspfV1kNEI3\n/ebFew6A8sdf2c+sOdTxTu4MI5iXM1fhCC6X4lAN8w1Ga3ML+k/kgL75mH62Yyzr\nOHXNkylTDfxz9qvq6qszVfWdzVaGXRfulW5nAbAXhuX1gmgZW+M7IQ22xyWC+I60\nUcaE2l9QtHFKuekdYnekTkSUA0ghVwuw+JCQZGQbq5LqbA5TkEYuibBOJD3MZYQ5\nC3DK4KHs/3wxf2aq+Pkf3mpSscC4B0Ba5tlpJawUWqnUmGd208sfUwD20MFfHM+1\nN+M6JYCv0tC0cyAV9Jq74bAUDXLMfkGKZyAWmlPaZBMMt4WaN0r2PAKp00T6PX6x\njTM6/aNDvNTpsaaUpMXRzH13AiJ/1SjfZwARAQABiQI8BBgBCgAmAhsMFiEEPm2C\nbT+6s4nC8440vE0GoI2LdW8FAmKeWsgFCSRtulkACgkQvE0GoI2LdW/pig//Zi0a\nbmFJKTxku0/LMI31ZaLn9gzXjv2ugmJumfXAce+nlaheCNBa+IMLQdAmrbislzLs\nqXX2+6Eqh4Q/vqGLCkElIzT9ulkgwwEp0cVF6jnXqlWHa0a/T6oAq10jRneaQFCE\nt6hweJ9KTUQufp5aAiZr/GVpBJLJ8kfOx+5eHvDj+VFlFUhpzzns/NfN5N+bthJ/\nWbt49tzmWaWoEFA0tlwMBPO3zEh/mo5lys0GqENPs4Yb4tL82qg+SG7jHSuH2lZk\nXLLyLQ6p63VZysL9+UTBtafs5jxnTopQFIXtzAOwdtQ8o7/6hhsUchRoUy23EIHT\nJ25yA2Qtb8Z/1m/G0e3lz46xHBPIs8FKSOPToCT6E1+9lomnzJPRBCCDTZO5imfX\n4N4l7BodW9nb7zEMHCi2BUM+InpSsEkQkQFs0HIRI2KHSyY30uN0pVXJLOoVQIBr\nWdUzLTTkN9w43fLpkcFXGbpU+pZvK2uksC3O+eBhIpZA9E7iZDwfEaZlUKO5kFvS\nV5f8ZM1jbEb0sOZNNNEaEhTFTl8pQPc2GqgZ3rYt9mqH5OwhzKftV9PDYulIbY+Y\nAN6eJhHj8Eu/IlxG6iYCDmF2hOVPs9aLo9zqdxbu8B6rUyVPOwfNbOR1U7WMRCYm\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", -+ "check_gpg": true, -+ "rhsm": false -+ }, -+ { -+ "name": "uekr8", -+ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/UEKR8/x86_64/", -+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGHncu8BEAC2dhocMZkdapnP9o/MvAnKOczaSpF4Cj9yqt49bxLPJCY57jz9\n2ZkJ5iGk6kpBt4rPTh18aAl30T+nPP8VMQjMhvHJKfZmBtaJJ5RpvvpK5mj1UgRJ\n4DQX7gqAbT0s/uZZcouZsJzXo3c7GNMrim1C+ScfGG6BoB6GVBK74jFeJNMsxZ2Y\nBwQhpE+KG+1zD94RZCySykJjNoKj+U4W5H2XdB/mNEc8icFqxjJGZ5BN0DA2Wqxn\nmwELTO3Q2ne1y9+sPn2YKhRqyihuZYaUPR/Jpdki93mk61MdaoTTxFPZ8FWAYrAW\n9KVdreT8K33SaTFFpmhbpndPEYesgCqDqiZG7Ywjgbf2nqSOzBr2ZX23PX7QUCvQ\nar58bNbWENLhC3B950TK+r23kkPa3GICE9WP5TftWJdbJMWRBX3YhdNooNGGCbeB\nxM7B/UV9hSRx1S/US8HvDhJezZDuKrpPXrNWJTuW9Kty2WGwUkEDT2GBbcjx9ocJ\nfqyNJKhaLoYKCVlsmhJUi4xCY0CDDapekWLZOzHB2zgT49uIjawV5ex6pA7oLaPI\nhQGvTcCl7GFWOP/6feazzIpnsJ4V3B2DoLnAevpZlINo/bi3Hv/YmbvE6NyYzD6c\n1y90pc0+Om1trLPCAZpaO1I369ZhLl6T/mCd92hrCG1y8K3PFiRIKpEMVwARAQAB\ntDVPcmFjbGUgTGludXggKHJlbGVhc2Uga2V5IDEpIDxzZWNhbGVydF91c0BvcmFj\nbGUuY29tPokCVAQTAQoAPhYhBD5tgm0/urOJwvOONLxNBqCNi3VvBQJinlnsAhsD\nBQklmAYABQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJELxNBqCNi3Vv3LEP/2au\nkXzbdA/T/7i+4AbGFfYnTWqmZy58wfteDNy1sk6cPmfOUqZQXUrJcSGqqeIDjPvl\nKNExpee/Ja4NGg2YfzkwH5IK5sXmEDKObXRCXGZh9/WyYpr4TBoDU2rSYBP4sbKm\nPsnVoRalt2Zb0qbQF8GilytoRabjI0gLzwhmoHBZMMc3MIO14KQ5yFbekaJZKcxE\nBxaDQ1NDZV1rOVbkg0yDLS9Nw89dDYWVn1wx0foRJcD277ExvmaB4vmC5yayo4ss\ncFldYLu7W9FHmh46flXQGfduORCbDFfjn92eB0jdrkuoEhVRpljAtMO15GMpuVbv\nHzbImI2f1MfydOa6dHbRAlzeV37fPz+1nO9IWdXqFeRG0nrH2gB02AfeoObMkK/a\nXYT9sq1mC5DaK6fbOPWlY+c2hIq0BhUpe+OBdDfmm7L+si9Ffj2sUdn4sHLN6Tj7\nBrJuWmJEz42+rblDNBkrdBC6XXDaRYILKSuGD65PVV+/pVl1c2EOqcktW00iiehb\neLhj2sz6NaoO5Rhx0J3pMsaCaEBAm8P6UxQSx4iGhZ8Kh5O1SVVlqu3xOhSGOKRE\nsS8gIjeV/Jl3frR4eZG/BpzdTjKZmQV7dvJ4gDuDE+X7rZBzUm7nggyE2pV6UbTD\n5Qwy+ASQfYHfHK4lsHD4kbO/We6H1fEFPlzlr14UuQINBGHncu8BEADBG52gWRob\nVEsQIzAfq2obFnwMroxMupXrDBka7i6cUJw8HsqyHs9maGxAuRDlAma2MBPUYcbm\nDH3bmctaUR7CA1RouPkb6qbZXwSwpvgN4eh4naPX20/VEp/cd5DhKWjP9yC70weh\nr4LmGWV41jBAMK0G1l6+FDw2ITgsamZP+tw0swCKqzpIY2waiygCtPHCCCFMuZ6S\n7hzQpsKVFh8zqzRxMs6Mni9olk4+xwng0ahYfoe2esByR2M1kGX62Y6BOcIRX1cE\nzYFCUww5GrjZdJoObBtffUSz+q2LNOBcqg5huRd8BoC+k5yrXUq8ypspfV1kNEI3\n/ebFew6A8sdf2c+sOdTxTu4MI5iXM1fhCC6X4lAN8w1Ga3ML+k/kgL75mH62Yyzr\nOHXNkylTDfxz9qvq6qszVfWdzVaGXRfulW5nAbAXhuX1gmgZW+M7IQ22xyWC+I60\nUcaE2l9QtHFKuekdYnekTkSUA0ghVwuw+JCQZGQbq5LqbA5TkEYuibBOJD3MZYQ5\nC3DK4KHs/3wxf2aq+Pkf3mpSscC4B0Ba5tlpJawUWqnUmGd208sfUwD20MFfHM+1\nN+M6JYCv0tC0cyAV9Jq74bAUDXLMfkGKZyAWmlPaZBMMt4WaN0r2PAKp00T6PX6x\njTM6/aNDvNTpsaaUpMXRzH13AiJ/1SjfZwARAQABiQI8BBgBCgAmAhsMFiEEPm2C\nbT+6s4nC8440vE0GoI2LdW8FAmKeWsgFCSRtulkACgkQvE0GoI2LdW/pig//Zi0a\nbmFJKTxku0/LMI31ZaLn9gzXjv2ugmJumfXAce+nlaheCNBa+IMLQdAmrbislzLs\nqXX2+6Eqh4Q/vqGLCkElIzT9ulkgwwEp0cVF6jnXqlWHa0a/T6oAq10jRneaQFCE\nt6hweJ9KTUQufp5aAiZr/GVpBJLJ8kfOx+5eHvDj+VFlFUhpzzns/NfN5N+bthJ/\nWbt49tzmWaWoEFA0tlwMBPO3zEh/mo5lys0GqENPs4Yb4tL82qg+SG7jHSuH2lZk\nXLLyLQ6p63VZysL9+UTBtafs5jxnTopQFIXtzAOwdtQ8o7/6hhsUchRoUy23EIHT\nJ25yA2Qtb8Z/1m/G0e3lz46xHBPIs8FKSOPToCT6E1+9lomnzJPRBCCDTZO5imfX\n4N4l7BodW9nb7zEMHCi2BUM+InpSsEkQkQFs0HIRI2KHSyY30uN0pVXJLOoVQIBr\nWdUzLTTkN9w43fLpkcFXGbpU+pZvK2uksC3O+eBhIpZA9E7iZDwfEaZlUKO5kFvS\nV5f8ZM1jbEb0sOZNNNEaEhTFTl8pQPc2GqgZ3rYt9mqH5OwhzKftV9PDYulIbY+Y\nAN6eJhHj8Eu/IlxG6iYCDmF2hOVPs9aLo9zqdxbu8B6rUyVPOwfNbOR1U7WMRCYm\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", -+ "check_gpg": true, -+ "rhsm": false -+ }, -+ { -+ "name": "appstream", -+ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/appstream/x86_64", -+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", -+ "check_gpg": true, -+ "rhsm": false -+ } -+ ] -+} --- -2.47.3 - diff --git a/SOURCES/1002-Add-support-for-OL-on-osbuild-composer.patch b/SOURCES/1002-Add-support-for-OL-on-osbuild-composer.patch deleted file mode 100644 index 7db4063..0000000 --- a/SOURCES/1002-Add-support-for-OL-on-osbuild-composer.patch +++ /dev/null @@ -1,192 +0,0 @@ -From 8143c24dc5903673c74852420ed92a6bb3c124b2 Mon Sep 17 00:00:00 2001 -From: Josue David Hernandez Gutierrez -Date: Fri, 17 Oct 2025 00:33:57 +0000 -Subject: [PATCH 02/10] Add support for OL on osbuild-composer - -Signed-off-by: Josue David Hernandez Gutierrez ---- - internal/runner/ol.go | 18 +++++++++++ - .../blueprint/pkg/blueprint/customizations.go | 2 +- - .../images/data/distrodefs/distros.yaml | 30 +++++++++++++++++++ - .../data/distrodefs/rhel-8/imagetypes.yaml | 15 ++++++++++ - .../data/distrodefs/rhel-9/imagetypes.yaml | 12 ++++++++ - .../osbuild/images/pkg/runner/ol.go | 18 +++++++++++ - 6 files changed, 94 insertions(+), 1 deletion(-) - create mode 100644 internal/runner/ol.go - create mode 100644 vendor/github.com/osbuild/images/pkg/runner/ol.go - -diff --git a/internal/runner/ol.go b/internal/runner/ol.go -new file mode 100644 -index 0000000..4d28e91 ---- /dev/null -+++ b/internal/runner/ol.go -@@ -0,0 +1,18 @@ -+package runner -+ -+type Ol struct { -+ Version uint64 -+} -+ -+func (o *Ol) String() string { -+ return "org.osbuild.ol" -+} -+ -+func (o *Ol) GetBuildPackages() []string { -+ packages := []string{ -+ "glibc", // ldconfig -+ "platform-python", // osbuild -+ "python3", -+ } -+ return packages -+} -diff --git a/vendor/github.com/osbuild/blueprint/pkg/blueprint/customizations.go b/vendor/github.com/osbuild/blueprint/pkg/blueprint/customizations.go -index 7d56026..2500de0 100644 ---- a/vendor/github.com/osbuild/blueprint/pkg/blueprint/customizations.go -+++ b/vendor/github.com/osbuild/blueprint/pkg/blueprint/customizations.go -@@ -285,7 +285,7 @@ func (c *Customizations) GetKernel() *KernelCustomization { - } - - if kernelName == "" { -- kernelName = "kernel" -+ kernelName = "kernel-uek" - } - - return &KernelCustomization{ -diff --git a/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml b/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml -index f1d3dab..9cb9645 100644 ---- a/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml -+++ b/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml -@@ -257,6 +257,21 @@ distros: - x86_64: "quay.io/toolbx-images/centos-toolbox:stream{{.MajorVersion}}" - aarch64: "quay.io/toolbx-images/centos-toolbox:stream{{.MajorVersion}}" - -+ - &ol9 -+ <<: *rhel9 -+ name: "ol-{{.MajorVersion}}.{{.MinorVersion}}" -+ match: '(?Pol)-(?P9)\.?(?P[0-9]{1,2})' -+ product: "Oracle Linux" -+ os_version: "{{.MajorVersion}}.{{.MinorVersion}}" -+ release_version: 9 -+ module_platform_id: "platform:el9" -+ vendor: "redhat" -+ ostree_ref_tmpl: "ol/9/%s/edge" -+ iso_label_tmpl: "OracleLinux-{{.Distro.MajorVersion}}-{{.Distro.MinorVersion}}-{{.Arch}}-dvd" -+ runner: -+ build_packages: *rhel9_runner_build_packages -+ name: org.osbuild.ol -+ - - &rhel8 - name: "rhel-{{.MajorVersion}}.{{.MinorVersion}}" - # rhel8 support being named "rhel-81" for "rhel-8.1" or "rhel-810" for "rhel-8.10" etc -@@ -344,6 +359,21 @@ distros: - x86_64: "quay.io/toolbx-images/centos-toolbox:stream{{.MajorVersion}}" - aarch64: "quay.io/toolbx-images/centos-toolbox:stream{{.MajorVersion}}" - -+ - &ol8 -+ <<: *rhel8 -+ name: "ol-{{.MajorVersion}}.{{.MinorVersion}}" -+ match: '(?Pol)-(?P8)\.?(?P[0-9]{1,2})' -+ product: "Oracle Linux" -+ os_version: "{{.MajorVersion}}.{{.MinorVersion}}" -+ release_version: 8 -+ module_platform_id: "platform:el8" -+ vendor: "redhat" -+ ostree_ref_tmpl: "ol/8/%s/edge" -+ iso_label_tmpl: "OracleLinux-{{.Distro.MajorVersion}}-{{.Distro.MinorVersion}}-{{.Arch}}-dvd" -+ runner: -+ build_packages: *rhel8_runner_build_packages -+ name: org.osbuild.ol -+ - - &rhel7 - name: "rhel-{{.MajorVersion}}.{{.MinorVersion}}" - match: 'rhel-7\.[0-9]' -diff --git a/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml b/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml -index ed22763..faba3b9 100644 ---- a/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml -+++ b/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml -@@ -137,6 +137,14 @@ - # original code so this never gets actually added so we - # don't add it here either - # - "rhc" -+ "ol kernel": -+ when: -+ distro_name: "ol" -+ append: -+ include: -+ - "kernel-uek-core" -+ - "kernel-uek-modules" -+ - "kernel-uek" - - # Default AMI (custom image built by users) images config. - # The configuration does not touch the RHSM configuration at all. -@@ -455,6 +463,13 @@ - append: - include: - - "biosdevname" -+ "ol kernel": -+ when: -+ distro_name: "ol" -+ append: -+ include: -+ - "kernel-uek" -+ - - anaconda_boot_pkgset: &anaconda_boot_pkgset - conditions: -diff --git a/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml b/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml -index 0f1032c..a028bf2 100644 ---- a/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml -+++ b/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml -@@ -446,6 +446,12 @@ - append: - include: - - "biosdevname" -+ "ol kernel": -+ when: -+ distro_name: "ol" -+ append: -+ include: -+ - "kernel-uek" - - wsl: &wsl_config - config: -@@ -648,6 +654,12 @@ - append: - include: - - "dmidecode" -+ "ol kernel": -+ when: -+ distro_name: "ol" -+ append: -+ include: -+ - "kernel-uek" - - partitioning: - ids: -diff --git a/vendor/github.com/osbuild/images/pkg/runner/ol.go b/vendor/github.com/osbuild/images/pkg/runner/ol.go -new file mode 100644 -index 0000000..4d28e91 ---- /dev/null -+++ b/vendor/github.com/osbuild/images/pkg/runner/ol.go -@@ -0,0 +1,18 @@ -+package runner -+ -+type Ol struct { -+ Version uint64 -+} -+ -+func (o *Ol) String() string { -+ return "org.osbuild.ol" -+} -+ -+func (o *Ol) GetBuildPackages() []string { -+ packages := []string{ -+ "glibc", // ldconfig -+ "platform-python", // osbuild -+ "python3", -+ } -+ return packages -+} --- -2.47.3 - diff --git a/SOURCES/1003-Removing-non-supported-image-types.patch b/SOURCES/1003-Removing-non-supported-image-types.patch deleted file mode 100644 index 84e4404..0000000 --- a/SOURCES/1003-Removing-non-supported-image-types.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 22c637202d5cef5fad099b14b4148605e6b2a9f1 Mon Sep 17 00:00:00 2001 -From: Josue David Hernandez Gutierrez -Date: Fri, 17 Oct 2025 00:41:35 +0000 -Subject: [PATCH 03/10] Remove unsopported image types - -Signed-off-by: Josue David Hernandez Gutierrez ---- - .../images/data/distrodefs/distros.yaml | 58 +++++++++++++++++++ - 1 file changed, 58 insertions(+) - -diff --git a/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml b/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml -index 0a737a6..8fe4340 100644 ---- a/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml -+++ b/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml -@@ -270,6 +270,35 @@ distros: - runner: - build_packages: *rhel9_runner_build_packages - name: org.osbuild.ol -+ conditions: -+ "some images are not supported by Oracle Linux": -+ when: -+ distro_name: "ol" -+ ignore_image_types: -+ - edge-ami -+ - edge-commit -+ - edge-container -+ - edge-installer -+ - edge-raw-image -+ - edge-simplified-installer -+ - edge-vsphere -+ - openstack -+ - gce -+ - minimal-raw -+ - vmdk -+ - ova -+ - vagrant-libvirt -+ - vagrant-virtualbox -+ - azure -+ # this images are ignored in all non rhel images -+ - azure-cvm -+ - azure-rhui -+ - azure-sap-rhui -+ - azure-sapapps-rhui -+ - ec2 -+ - ec2-sap -+ - ec2-ha -+ - wsl - - - &rhel8 - name: "rhel-{{.MajorVersion}}.{{.MinorVersion}}" -@@ -371,6 +400,35 @@ distros: - runner: - build_packages: *rhel8_runner_build_packages - name: org.osbuild.ol -+ conditions: -+ "some images are not supported by Oracle Linux": -+ when: -+ distro_name: "ol" -+ ignore_image_types: -+ - edge-ami -+ - edge-commit -+ - edge-container -+ - edge-installer -+ - edge-raw-image -+ - edge-simplified-installer -+ - edge-vsphere -+ - openstack -+ - gce -+ - minimal-raw -+ - vmdk -+ - ova -+ - vagrant-libvirt -+ - vagrant-virtualbox -+ - azure -+ # this images are ignored in all non rhel images -+ - azure-cvm -+ - azure-rhui -+ - azure-sap-rhui -+ - azure-sapapps-rhui -+ - ec2 -+ - ec2-sap -+ - ec2-ha -+ - wsl - - - &rhel7 - name: "rhel-{{.MajorVersion}}.{{.MinorVersion}}" --- -2.47.3 - diff --git a/SOURCES/1004-Fix-packageSets.patch b/SOURCES/1004-Fix-packageSets.patch deleted file mode 100644 index ec2ec7a..0000000 --- a/SOURCES/1004-Fix-packageSets.patch +++ /dev/null @@ -1,252 +0,0 @@ -From b1f36f1f4f924b10b14f61e978b8324ec75e0b08 Mon Sep 17 00:00:00 2001 -From: Josue David Hernandez Gutierrez -Date: Fri, 17 Oct 2025 00:53:53 +0000 -Subject: [PATCH 04/10] fix packageSets - -Removing packages not available in Oracle Linux -like redhat-release-eula and adding packages needed for some Oracle -Linux images like dracut-config-rescue - -Signed-off-by: Josue David Hernandez Gutierrez ---- - .../data/distrodefs/rhel-8/imagetypes.yaml | 37 ++++++++++++--- - .../data/distrodefs/rhel-9/imagetypes.yaml | 45 ++++++++++++++++--- - 2 files changed, 68 insertions(+), 14 deletions(-) - -diff --git a/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml b/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml -index faba3b9..660190b 100644 ---- a/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml -+++ b/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml -@@ -16,7 +16,6 @@ - - "NetworkManager" - - "NetworkManager-cloud-setup" - - "redhat-release" -- - "redhat-release-eula" - - "rsync" - - "tar" - - "yum-utils" -@@ -57,6 +56,12 @@ - append: - include: - - "insights-client" -+ "include redhat-release-eula for non oracle linux": -+ when: -+ not_distro_name: "ol" -+ append: -+ include: -+ - "redhat-release-eula" - - azure_common_pkgset: &azure_common_pkgset - include: -@@ -95,7 +100,6 @@ - - "buildah" - - "cockpit-podman" - - "containernetworking-plugins" -- - "dnf-plugin-spacewalk" - - "dracut-config-rescue" - - "glibc-all-langpacks" - - "iprutils" -@@ -121,7 +125,6 @@ - - "libertas-usb8388-firmware" - - "plymouth" - - "podman" -- - "python3-dnf-plugin-spacewalk" - - "python3-hwdata" - - "python3-rhnlib" - - "rhn-check" -@@ -593,7 +596,6 @@ - - "pigz" - - "python3-pyatspi" - - "rdma-core" -- - "redhat-release-eula" - - "rpm-ostree" - - "rsync" - - "rsyslog" -@@ -638,6 +640,12 @@ - append: - include: - - "dmidecode" -+ "include redhat-release-eula for non oracle linux": -+ when: -+ not_distro_name: "ol" -+ append: -+ include: -+ - "redhat-release-eula" - - gce_common_pkgset: &gce_common_pkgset - include: -@@ -726,7 +734,6 @@ - - "python3-jsonschema" - - "qemu-guest-agent" - - "redhat-release" -- - "redhat-release-eula" - - "rsync" - - "tar" - - "tcpdump" -@@ -737,7 +744,6 @@ - - "alsa-lib" - - "alsa-tools-firmware" - - "biosdevname" -- - "dnf-plugin-spacewalk" - - "dracut-config-rescue" - - "fedora-release" - - "fedora-repos" -@@ -779,6 +785,12 @@ - include: - - "insights-client" - - "subscription-manager-cockpit" -+ "include redhat-release-eula for non oracle linux": -+ when: -+ not_distro_name: "ol" -+ append: -+ include: -+ - "redhat-release-eula" - - disk_sizes: - default_required_partition_sizes: &default_required_dir_sizes -@@ -1292,6 +1304,18 @@ image_types: - - "yum" - conditions: - <<: *condition_rhel_insights_clinet_subman -+ "include redhat-release-eula for non oracle linux": -+ when: -+ not_distro_name: "ol" -+ append: -+ include: -+ - "redhat-release-eula" -+ "include dracut-config-rescue for ol": -+ when: -+ distro_name: "ol" -+ append: -+ include: -+ - "dracut-config-rescue" - - ami: &ami - filename: "image.raw" -@@ -2485,7 +2509,6 @@ image_types: - - "biosdevname" - - "cpio" - - "diffutils" -- - "dnf-plugin-spacewalk" - - "dracut" - - "elfutils-debuginfod-client" - - "fedora-release" -diff --git a/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml b/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml -index a028bf2..3e0f536 100644 ---- a/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml -+++ b/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml -@@ -158,7 +158,6 @@ - - "langpacks-en" - - "NetworkManager-cloud-setup" - - "redhat-release" -- - "redhat-release-eula" - - "rsync" - - "tuned" - - "tar" -@@ -202,6 +201,13 @@ - append: - include: - - "system-reinstall-bootc" -+ "include redhat-release-eula for not oracle linux": -+ when: -+ not_distro_name: "ol" -+ append: -+ include: -+ - "redhat-release-eula" -+ - azure_base_pkgset: &azure_base_pkgset - include: - - "@Server" -@@ -604,7 +610,6 @@ - - "prefixdevname" - - "python3-pyatspi" - - "rdma-core" -- - "redhat-release-eula" - - "rng-tools" - - "rpcbind" - - "rpm-ostree" -@@ -654,7 +659,13 @@ - append: - include: - - "dmidecode" -- "ol kernel": -+ "include redhat-release-eula for not oracle linux": -+ when: -+ not_distro_name: "ol" -+ append: -+ include: -+ - "redhat-release-eula" -+ "Custom packages for Oracle Linux": - when: - distro_name: "ol" - append: -@@ -1243,13 +1254,10 @@ image_types: - - "python3-jsonschema" - - "qemu-guest-agent" - - "redhat-release" -- - "redhat-release-eula" - - "rsync" - - "tar" - - "tcpdump" - - "tuned" -- exclude: -- - "dracut-config-rescue" - conditions: &conditions_subscription_manager_cockpit - "add subscription-manager-cockpit on rhel": - when: -@@ -1257,6 +1265,20 @@ image_types: - append: - include: - - "subscription-manager-cockpit" -+ "include dracut-config-rescue for ol": -+ when: -+ distro_name: "ol" -+ append: -+ include: -+ - "dracut-config-rescue" -+ "include pkgs needed for not oracle linux": -+ when: -+ not_distro_name: "ol" -+ append: -+ include: -+ - "redhat-release-eula" -+ exclude: -+ - "dracut-config-rescue" - - qcow2: &qcow2 - name_aliases: ["guest-image"] -@@ -1318,7 +1340,6 @@ image_types: - - "python3-jsonschema" - - "qemu-guest-agent" - - "redhat-release" -- - "redhat-release-eula" - - "rsync" - - "tar" - - "tuned" -@@ -1357,6 +1378,10 @@ image_types: - - "libertas-sd8787-firmware" - - "nss" - - "plymouth" -+ - "rhn-check" -+ - "rhn-setup" -+ - "rhnsd" -+ - "dnf-plugin-spacewalk" - - "rng-tools" - - "udisks2" - conditions: &conditions_pkgsets_insigths_pkgs -@@ -1367,6 +1392,12 @@ image_types: - include: - - "insights-client" - - "subscription-manager-cockpit" -+ "include redhat-release-eula for not oracle linux": -+ when: -+ not_distro_name: "ol" -+ append: -+ include: -+ - "redhat-release-eula" - - "vagrant-libvirt": &vagrant_libvirt - <<: *qcow2 --- -2.47.3 - diff --git a/SOURCES/1005-Increase-support-for-OCI-images.patch b/SOURCES/1005-Increase-support-for-OCI-images.patch deleted file mode 100644 index 7443ab8..0000000 --- a/SOURCES/1005-Increase-support-for-OCI-images.patch +++ /dev/null @@ -1,452 +0,0 @@ -From 230b34d77af5f085fd98a7a276292b6ff53e09ac Mon Sep 17 00:00:00 2001 -From: Josue David Hernandez Gutierrez -Date: Fri, 17 Oct 2025 01:03:57 +0000 -Subject: [PATCH 05/10] Increase support for OCI images - -Add support for OCI images: -- Support for OCI hybrid images -- Add selinux auto-relabeling during first boot -- Support dnf variables inside OCI built images - -Signed-off-by: Josue David Hernandez Gutierrez ---- - .../data/distrodefs/rhel-8/imagetypes.yaml | 167 ++++++++++++++++- - .../data/distrodefs/rhel-9/imagetypes.yaml | 171 +++++++++++++++++- - .../images/pkg/distro/generic/images.go | 4 + - .../osbuild/images/pkg/distro/image_config.go | 1 + - .../osbuild/images/pkg/manifest/os.go | 11 +- - 5 files changed, 351 insertions(+), 3 deletions(-) - -diff --git a/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml b/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml -index a8be32a..884f42e 100644 ---- a/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml -+++ b/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml -@@ -1480,7 +1480,7 @@ image_types: - - <<: *s390x_zipl_platform - image_format: "qcow2" - qcow2_compat: "0.10" -- image_config: -+ image_config: &qcow2_image_config - default_target: "multi-user.target" - kernel_options: - - "console=tty0" -@@ -2402,6 +2402,171 @@ image_types: - - <<: *x86_64_bios_platform - image_format: "qcow2" - qcow2_compat: "0.10" -+ image_config: -+ <<: *qcow2_image_config -+ default_target: "multi-user.target" -+ selinux_force_relabel: true -+ hostonly: true -+ kernel_options: -+ - "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" -+ files: -+ - path: &early-oci-setup "/sbin/early-oci-setup" -+ user: "root" -+ group: "root" -+ mode: 0700 -+ data: | -+ #!/usr/bin/env bash -+ arch=$(uname -m) -+ -+ imds_domain=$(curl -H "Authorization:Bearer Oracle" -sfm 25 http://169.254.169.254/opc/v2/instance/ 2>/dev/null | jq -r '.regionInfo.realmDomainComponent') -+ imds_region=$(curl -H "Authorization:Bearer Oracle" -sfm 25 http://169.254.169.254/opc/v2/instance/ 2>/dev/null | jq -r '.regionInfo.regionIdentifier') -+ imds_realm=$(curl -H "Authorization:Bearer Oracle" -sfm 25 http://169.254.169.254/opc/v2/instance/ 2>/dev/null | jq -r '.regionInfo.realmKey') -+ -+ function retry_command() { -+ -+ retry_attempts=5 -+ retry_interval_sec=2 -+ while [[ "$retry_attempts" -gt 0 ]]; do -+ command_success=true -+ "$@" || { command_success=false; } -+ if [[ "$command_success" == false ]]; then -+ (( retry_attempts-- )) -+ logger -t earlyocisetup "Error occurred running command $@. Will retry in $retry_interval_sec seconds" -+ sleep $retry_interval_sec -+ else -+ break -+ fi -+ done -+ -+ if [[ "$command_success" == false ]]; then -+ logger -t earlyocisetup "ERROR: failed to execute command '$@' (Retried $retry_attempts times)" -+ exit 1 -+ fi -+ } -+ -+ if [[ -n "$imds_realm" ]]; then -+ domain="oci.$imds_domain" -+ region="$imds_region" -+ ociregion=".$region" -+ reponame="oci_install" -+ repourl="https://yum$ociregion.$domain/repo/OracleLinux/OL8/oci/included/$arch/" -+ else -+ logger -t earlyocisetup 'Running out of OCI region' -+ exit 1 -+ fi -+ -+ echo $region > /etc/dnf/vars/region -+ echo $domain > /etc/dnf/vars/ocidomain -+ echo $ociregion > /etc/dnf/vars/ociregion -+ -+ cat < /etc/yum.repos.d/oci-install.repo -+ [$reponame] -+ name=Install OCI repo ($arch) -+ baseurl=$repourl -+ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle -+ gpgcheck=1 -+ enabled=1 -+ EOF -+ -+ retry_command yum install -y oci-included-release-el8 -+ retry_command yum install -y oci-linux-config -+ retry_command yum install -y python36-oci-sdk -+ -+ if $(yum repolist |grep -q "$reponame"); then -+ rm -f /etc/yum.repos.d/oci-install.repo -+ fi -+ -+ mkdir -p /var/lib/oci-repo-installer -+ touch /var/lib/oci-repo-installer/oci-repo-installed -+ -+ rm -f /usr/lib/systemd/system/oci-repo-installer.service /sbin/early-oci-setup -+ systemd_unit: -+ - filename: &oci_repo_installer "oci-repo-installer.service" -+ config: -+ "Unit": -+ Description: "First-boot service for installing oci repository once OCI image has booted" -+ ConditionPathExists: ["!/var/lib/oci-repo-installer/oci-repo-installed"] -+ Requires: ["network-online.target"] -+ "Service": -+ Type: "oneshot" -+ RemainAfterExit: false -+ ExecStart: [*early-oci-setup] -+ "Install": -+ WantedBy: ["network-online.target"] -+ enabled_services: -+ - *oci_repo_installer -+ conditions: -+ "Custom options for x86_64": -+ when: -+ arch: "x86_64" -+ shallow_merge: -+ kernel_options: -+ - "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" -+ - "console=tty0" -+ - "console=ttyS0,115200n8" -+ - "no_timer_check" -+ "Custom options for Aarch64": -+ when: -+ arch: "aarch64" -+ shallow_merge: -+ kernel_options: -+ - "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" -+ - "ro" -+ - "crashkernel=auto" -+ - "LANG=en_US.UTF-8" -+ - "console=ttyAMA0" -+ - "console=ttyAMA0,115200" -+ - "ip=dhcp,dhcp6" -+ package_sets: -+ os: -+ - *qcow2_common_pkgset -+ - include: -+ - "authselect-compat" -+ - "jq" -+ conditions: &condition_rhel_insights_clinet_subman -+ "add insights/subscription manager for copilot": -+ when: -+ distro_name: "rhel" -+ append: -+ include: -+ - "insights-client" -+ - "subscription-manager-cockpit" -+ "include redhat-release-eula for non oracle linux": -+ when: -+ not_distro_name: "ol" -+ append: -+ include: -+ - "redhat-release-eula" - - openstack: - <<: *qcow2 -diff --git a/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml b/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml -index fa3f916..927ad16 100644 ---- a/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml -+++ b/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml -@@ -1317,7 +1317,8 @@ image_types: - <<: *default_partition_tables - package_sets: - os: -- - include: -+ - &qcow2_package_sets -+ include: - - "@core" - - "authselect-compat" - - "chrony" -@@ -1442,6 +1443,174 @@ image_types: - platforms: - - <<: *x86_64_bios_platform - image_format: "qcow2" -+ image_config: -+ <<: *qcow2_image_config -+ default_target: "multi-user.target" -+ selinux_force_relabel: true -+ hostonly: true -+ kernel_options: -+ - "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" -+ files: -+ - path: &early-oci-setup "/sbin/early-oci-setup" -+ user: "root" -+ group: "root" -+ mode: 0700 -+ data: | -+ #!/usr/bin/env bash -+ arch=$(uname -m) -+ -+ imds_domain=$(curl -H "Authorization:Bearer Oracle" -sfm 25 http://169.254.169.254/opc/v2/instance/ 2>/dev/null | jq -r '.regionInfo.realmDomainComponent') -+ imds_region=$(curl -H "Authorization:Bearer Oracle" -sfm 25 http://169.254.169.254/opc/v2/instance/ 2>/dev/null | jq -r '.regionInfo.regionIdentifier') -+ imds_realm=$(curl -H "Authorization:Bearer Oracle" -sfm 25 http://169.254.169.254/opc/v2/instance/ 2>/dev/null | jq -r '.regionInfo.realmKey') -+ -+ function retry_command() { -+ -+ retry_attempts=5 -+ retry_interval_sec=2 -+ while [[ "$retry_attempts" -gt 0 ]]; do -+ command_success=true -+ "$@" || { command_success=false; } -+ if [[ "$command_success" == false ]]; then -+ (( retry_attempts-- )) -+ logger -t earlyocisetup "Error occurred running command $@. Will retry in $retry_interval_sec seconds" -+ sleep $retry_interval_sec -+ else -+ break -+ fi -+ done -+ -+ if [[ "$command_success" == false ]]; then -+ logger -t earlyocisetup "ERROR: failed to execute command '$@' (Retried $retry_attempts times)" -+ exit 1 -+ fi -+ } -+ -+ if [[ -n "$imds_realm" ]]; then -+ domain="oci.$imds_domain" -+ region="$imds_region" -+ ociregion=".$region" -+ reponame="oci_install" -+ repourl="https://yum$ociregion.$domain/repo/OracleLinux/OL9/oci/included/$arch/" -+ else -+ logger -t earlyocisetup 'Running out of OCI region' -+ exit 1 -+ fi -+ -+ echo $region > /etc/dnf/vars/region -+ echo $domain > /etc/dnf/vars/ocidomain -+ echo $ociregion > /etc/dnf/vars/ociregion -+ -+ cat < /etc/yum.repos.d/oci-install.repo -+ [$reponame] -+ name=Install OCI repo ($arch) -+ baseurl=$repourl -+ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle -+ gpgcheck=1 -+ enabled=1 -+ EOF -+ -+ retry_command yum install -y oci-included-release-el9 -+ retry_command yum install -y oci-linux-config -+ retry_command yum install -y python39-oci-sdk -+ -+ if $(yum repolist |grep -q "$reponame"); then -+ rm -f /etc/yum.repos.d/oci-install.repo -+ fi -+ -+ mkdir -p /var/lib/oci-repo-installer -+ touch /var/lib/oci-repo-installer/oci-repo-installed -+ -+ rm -f /usr/lib/systemd/system/oci-repo-installer.service /sbin/early-oci-setup -+ systemd_unit: -+ - filename: &oci_repo_installer "oci-repo-installer.service" -+ config: -+ "Unit": -+ Description: "First-boot service for installing oci repository once OCI image has booted" -+ ConditionPathExists: ["!/var/lib/oci-repo-installer/oci-repo-installed"] -+ Requires: ["network-online.target"] -+ "Service": -+ Type: "oneshot" -+ RemainAfterExit: false -+ ExecStart: [*early-oci-setup] -+ "Install": -+ WantedBy: ["network-online.target"] -+ enabled_services: -+ - *oci_repo_installer -+ conditions: -+ "Custom options for x86_64": -+ when: -+ arch: "x86_64" -+ shallow_merge: -+ kernel_options: -+ - "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" -+ - "console=tty0" -+ - "console=ttyS0,115200n8" -+ - "no_timer_check" -+ "Custom options for Aarch64": -+ when: -+ arch: "aarch64" -+ shallow_merge: -+ kernel_options: -+ - "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" -+ - "ro" -+ - "crashkernel=auto" -+ - "LANG=en_US.UTF-8" -+ - "console=ttyAMA0" -+ - "console=ttyAMA0,115200" -+ - "ip=dhcp,dhcp6" -+ package_sets: -+ os: -+ - *qcow2_package_sets -+ - conditions: &conditions_pkgsets_insigths_pkgs -+ "add insights pkgs on rhel": -+ when: -+ distro_name: "rhel" -+ append: -+ include: -+ - "insights-client" -+ - "subscription-manager-cockpit" -+ "include redhat-release-eula for not oracle linux": -+ when: -+ not_distro_name: "ol" -+ append: -+ include: -+ - "redhat-release-eula" -+ "Add iscsi package": -+ when: -+ distro_name: "ol" -+ append: -+ include: -+ - "iscsi-initiator-utils" - - vhd: &vhd - <<: *qcow2 -diff --git a/vendor/github.com/osbuild/images/pkg/distro/generic/images.go b/vendor/github.com/osbuild/images/pkg/distro/generic/images.go -index 3c088ee..7ca3fec 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/generic/images.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/generic/images.go -@@ -68,6 +68,10 @@ func osCustomizations(t *imageType, osPackageSet rpmmd.PackageSet, options distr - osc.ExcludeDocs = *imageConfig.ExcludeDocs - } - -+ if imageConfig.Hostonly != nil { -+ osc.Hostonly = *imageConfig.Hostonly -+ } -+ - if !t.ImageTypeYAML.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/image_config.go b/vendor/github.com/osbuild/images/pkg/distro/image_config.go -index 7c3289a..9b7d60e 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/image_config.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/image_config.go -@@ -93,6 +93,7 @@ type ImageConfig struct { - - Files []*fsnode.File - Directories []*fsnode.Directory -+ Hostonly *bool `yaml:"hostonly,omitempty"` - - // KernelOptionsBootloader controls whether kernel command line options - // should be specified in the bootloader grubenv configuration. Otherwise -diff --git a/vendor/github.com/osbuild/images/pkg/manifest/os.go b/vendor/github.com/osbuild/images/pkg/manifest/os.go -index dc3365f..03e8c71 100644 ---- a/vendor/github.com/osbuild/images/pkg/manifest/os.go -+++ b/vendor/github.com/osbuild/images/pkg/manifest/os.go -@@ -160,7 +160,8 @@ type OSCustomizations struct { - - CACerts []string - -- FIPS bool -+ FIPS bool -+ Hostonly bool - - // NoBLS configures the image bootloader with traditional menu entries - // instead of BLS. Required for legacy systems like RHEL 7. -@@ -733,6 +734,14 @@ func (p *OS) serialize() osbuild.Pipeline { - pipeline.AddStage(osbuild.NewUdevRulesStage(p.OSCustomizations.UdevRules)) - } - -+ if p.OSCustomizations.Hostonly { -+ pipeline.AddStage(osbuild.NewDracutStage(&osbuild.DracutStageOptions{ -+ Kernel: []string{p.kernelVer}, -+ EarlyMicrocode: true, -+ Reproducible: true, -+ })) -+ } -+ - if pt := p.PartitionTable; pt != nil { - rootUUID, kernelOptions, err := osbuild.GenImageKernelOptions(p.PartitionTable, p.OSCustomizations.MountUnits) - if err != nil { --- -2.47.3 - diff --git a/SOURCES/1006-Increase-default-boot-size-to-1GB.patch b/SOURCES/1006-Increase-default-boot-size-to-1GB.patch deleted file mode 100644 index ac97739..0000000 --- a/SOURCES/1006-Increase-default-boot-size-to-1GB.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 590db7f513259fe653519e0182b4dda6685b76be Mon Sep 17 00:00:00 2001 -From: Josue David Hernandez Gutierrez -Date: Wed, 1 Oct 2025 01:28:46 +0000 -Subject: [PATCH 06/10] Increase default /boot size to 1GB - -Signed-off-by: Josue David Hernandez Gutierrez -Signed-off-by: Alex Burmashev ---- - vendor/github.com/osbuild/images/pkg/disk/partition_table.go | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -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 6cf353b..0eea1fb 100644 ---- a/vendor/github.com/osbuild/images/pkg/disk/partition_table.go -+++ b/vendor/github.com/osbuild/images/pkg/disk/partition_table.go -@@ -648,7 +648,7 @@ func clampFSSize(mountpoint string, size uint64) uint64 { - var minSize uint64 = 1073741824 - - if mountpoint == "/boot" { -- minSize = 524288000 -+ minSize = 1073741824 - } - - if minSize > size { --- -2.47.3 - diff --git a/SOURCES/1007-Support-using-repository-definitions-with-OCI-variab.patch b/SOURCES/1007-Support-using-repository-definitions-with-OCI-variab.patch deleted file mode 100644 index a2d5943..0000000 --- a/SOURCES/1007-Support-using-repository-definitions-with-OCI-variab.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 74d061ee407e4a99a81c8a5ef4029ea07586be40 Mon Sep 17 00:00:00 2001 -From: Josue David Hernandez Gutierrez -Date: Thu, 21 Aug 2025 23:11:32 +0000 -Subject: [PATCH 07/10] Support using repository definitions with OCI - variables. - -We can use repository definitions in a format, more similar to generic Oracle repositories -with DNF vars. -Essentially in osbuild-composer log when parsing repos, we at first parse variables, then process -original repo file in memory and replace vars with their values and write modified repo to buffer. -After that we use buffer to actually populate repository data. - -If we have failed to read ocidomain, which is the key variable, we fallback to values to generic public repos. - -Signed-off-by: Alex Burmashev -Signed-off-by: Josue David Hernandez Gutierrez ---- - .../osbuild/images/pkg/rpmmd/repository.go | 42 ++++++++++++++++++- - 1 file changed, 41 insertions(+), 1 deletion(-) - -diff --git a/vendor/github.com/osbuild/images/pkg/rpmmd/repository.go b/vendor/github.com/osbuild/images/pkg/rpmmd/repository.go -index bcad415..a04548a 100644 ---- a/vendor/github.com/osbuild/images/pkg/rpmmd/repository.go -+++ b/vendor/github.com/osbuild/images/pkg/rpmmd/repository.go -@@ -10,6 +10,8 @@ import ( - "strings" - "time" - -+ "bufio" -+ "bytes" - "github.com/gobwas/glob" - ) - -@@ -276,9 +278,47 @@ func LoadRepositoriesFromFile(filename string) (map[string][]RepoConfig, error) - func LoadRepositoriesFromReader(r io.Reader) (map[string][]RepoConfig, error) { - var reposMap map[string][]repository - repoConfigs := make(map[string][]RepoConfig) -+ var ocidomain, ociregion, region []byte - -- err := json.NewDecoder(r).Decode(&reposMap) -+ var OCIlines []string -+ ocidomain = []byte("oracle.com") -+ ociregion = []byte("") -+ region = []byte("") -+ -+ ociregion, err := os.ReadFile("/etc/dnf/vars/ociregion") -+ if err != nil { -+ fmt.Println("Error while reading file: /etc/dnf/vars/ociregion") -+ } -+ region, err = os.ReadFile("/etc/dnf/vars/region") -+ if err != nil { -+ fmt.Println("Error while reading file: /etc/dnf/vars/region") -+ } -+ ocidomain, err = os.ReadFile("/etc/dnf/vars/ocidomain") -+ if err != nil { -+ fmt.Println("Error while reading file: /etc/dnf/vars/ocidomain") -+ } -+ if ocidomain == nil { -+ ocidomain = []byte("oracle.com") -+ ociregion = []byte("") -+ } -+ scanner := bufio.NewScanner(r) -+ OCIreplacer := strings.NewReplacer("$ocidomain", strings.TrimSuffix(string(ocidomain), "\n"), "$ociregion", strings.TrimSuffix(string(ociregion), "\n"), "$region", strings.TrimSuffix(string(region), "\n")) -+ for scanner.Scan() { -+ line := scanner.Text() -+ OCIline := OCIreplacer.Replace(line) -+ OCIlines = append(OCIlines, OCIline) -+ continue -+ } -+ if err := scanner.Err(); err != nil { -+ panic(err) -+ } -+ fOCI := strings.Join(OCIlines, "\n") -+ -+ buf := new(bytes.Buffer) -+ fmt.Fprint(buf, fOCI) -+ err = json.NewDecoder(buf).Decode(&reposMap) - if err != nil { -+ fmt.Println("Error parsing the repo") - return nil, err - } - --- -2.47.3 - diff --git a/SOURCES/1008-Update-Oracle-repositories-to-contain-OCI-variables.patch b/SOURCES/1008-Update-Oracle-repositories-to-contain-OCI-variables.patch deleted file mode 100644 index 0699319..0000000 --- a/SOURCES/1008-Update-Oracle-repositories-to-contain-OCI-variables.patch +++ /dev/null @@ -1,121 +0,0 @@ -From b9bcc3182f6c161e1f8efc36bae355fe0ba55e8a Mon Sep 17 00:00:00 2001 -From: Josue David Hernandez Gutierrez -Date: Fri, 17 Oct 2025 01:07:21 +0000 -Subject: [PATCH 08/10] Update Oracle repositories to contain OCI variables - -We now support oci variables for osbuild-composer, so let's actually use them. - -Signed-off-by: Alex Burmashev -Signed-off-by: Josue David Hernandez Gutierrez ---- - .../osbuild/images/data/repositories/ol-810.json | 12 ++++++------ - .../osbuild/images/data/repositories/ol-96.json | 12 ++++++------ - 2 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/vendor/github.com/osbuild/images/data/repositories/ol-810.json b/vendor/github.com/osbuild/images/data/repositories/ol-810.json -index a23b3c6..e8cffe7 100644 ---- a/vendor/github.com/osbuild/images/data/repositories/ol-810.json -+++ b/vendor/github.com/osbuild/images/data/repositories/ol-810.json -@@ -2,19 +2,19 @@ - "aarch64": [ - { - "name": "baseos", -- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/baseos/latest/aarch64", -+ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/baseos/latest/aarch64", - "check_gpg": false, - "rhsm": false - }, - { - "name": "uekr7", -- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/UEKR7/aarch64/", -+ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/UEKR7/aarch64/", - "check_gpg": false, - "rhsm": false - }, - { - "name": "appstream", -- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/appstream/aarch64", -+ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/appstream/aarch64", - "check_gpg": false, - "rhsm": false - } -@@ -22,19 +22,19 @@ - "x86_64": [ - { - "name": "baseos", -- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/baseos/latest/x86_64", -+ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/baseos/latest/x86_64", - "check_gpg": false, - "rhsm": false - }, - { - "name": "uekr7", -- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/UEKR7/x86_64/", -+ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/UEKR7/x86_64/", - "check_gpg": false, - "rhsm": false - }, - { - "name": "appstream", -- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL8/appstream/x86_64", -+ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL8/appstream/x86_64", - "check_gpg": false, - "rhsm": false - } -diff --git a/vendor/github.com/osbuild/images/data/repositories/ol-96.json b/vendor/github.com/osbuild/images/data/repositories/ol-96.json -index 2a9608a..ace1e38 100644 ---- a/vendor/github.com/osbuild/images/data/repositories/ol-96.json -+++ b/vendor/github.com/osbuild/images/data/repositories/ol-96.json -@@ -2,21 +2,21 @@ - "aarch64": [ - { - "name": "baseos", -- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/aarch64", -+ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/baseos/latest/aarch64", - "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", - "check_gpg": true, - "rhsm": false - }, - { - "name": "uekr8", -- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/UEKR8/aarch64/", -+ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/UEKR8/aarch64/", - "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", - "check_gpg": true, - "rhsm": false - }, - { - "name": "appstream", -- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/appstream/aarch64", -+ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/appstream/aarch64", - "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", - "check_gpg": true, - "rhsm": false -@@ -25,21 +25,21 @@ - "x86_64": [ - { - "name": "baseos", -- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/x86_64", -+ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/baseos/latest/x86_64", - "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", - "check_gpg": true, - "rhsm": false - }, - { - "name": "uekr8", -- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/UEKR8/x86_64/", -+ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/UEKR8/x86_64/", - "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", - "check_gpg": true, - "rhsm": false - }, - { - "name": "appstream", -- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/appstream/x86_64", -+ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/appstream/x86_64", - "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----", - "check_gpg": true, - "rhsm": false --- -2.47.3 - diff --git a/SOURCES/1009-Simplify-repo-name-removing-minor-versions.patch b/SOURCES/1009-Simplify-repo-name-removing-minor-versions.patch deleted file mode 100644 index cee870a..0000000 --- a/SOURCES/1009-Simplify-repo-name-removing-minor-versions.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 427bf53bee2421b7c7888563334dfd3eae2e1b34 Mon Sep 17 00:00:00 2001 -From: Josue David Hernandez Gutierrez -Date: Fri, 17 Oct 2025 01:11:18 +0000 -Subject: [PATCH 09/10] Simplify repo name removing minor versions - -Rename ol-810.json to ol-8.json and ol-96.json to ol-9.json - -Signed-off-by: Josue David Hernandez Gutierrez ---- - .../osbuild/images/data/distrodefs/distros.yaml | 12 ++++++------ - .../data/repositories/{ol-810.json => ol-8.json} | 0 - .../data/repositories/{ol-96.json => ol-9.json} | 0 - vendor/github.com/osbuild/images/pkg/distro/host.go | 8 ++++++++ - 4 files changed, 14 insertions(+), 6 deletions(-) - rename vendor/github.com/osbuild/images/data/repositories/{ol-810.json => ol-8.json} (100%) - rename vendor/github.com/osbuild/images/data/repositories/{ol-96.json => ol-9.json} (100%) - -diff --git a/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml b/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml -index 8fe4340..3be8b8f 100644 ---- a/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml -+++ b/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml -@@ -259,10 +259,10 @@ distros: - - - &ol9 - <<: *rhel9 -- name: "ol-{{.MajorVersion}}.{{.MinorVersion}}" -- match: '(?Pol)-(?P9)\.?(?P[0-9]{1,2})' -+ name: "ol-{{.MajorVersion}}" -+ match: '(?Pol)-(?P9)' - product: "Oracle Linux" -- os_version: "{{.MajorVersion}}.{{.MinorVersion}}" -+ os_version: "{{.MajorVersion}}" - release_version: 9 - module_platform_id: "platform:el9" - vendor: "redhat" -@@ -389,10 +389,10 @@ distros: - - - &ol8 - <<: *rhel8 -- name: "ol-{{.MajorVersion}}.{{.MinorVersion}}" -- match: '(?Pol)-(?P8)\.?(?P[0-9]{1,2})' -+ name: "ol-{{.MajorVersion}}" -+ match: '(?Pol)-(?P8)' - product: "Oracle Linux" -- os_version: "{{.MajorVersion}}.{{.MinorVersion}}" -+ os_version: "{{.MajorVersion}}" - release_version: 8 - module_platform_id: "platform:el8" - vendor: "redhat" -diff --git a/vendor/github.com/osbuild/images/data/repositories/ol-810.json b/vendor/github.com/osbuild/images/data/repositories/ol-8.json -similarity index 100% -rename from vendor/github.com/osbuild/images/data/repositories/ol-810.json -rename to vendor/github.com/osbuild/images/data/repositories/ol-8.json -diff --git a/vendor/github.com/osbuild/images/data/repositories/ol-96.json b/vendor/github.com/osbuild/images/data/repositories/ol-9.json -similarity index 100% -rename from vendor/github.com/osbuild/images/data/repositories/ol-96.json -rename to vendor/github.com/osbuild/images/data/repositories/ol-9.json -diff --git a/vendor/github.com/osbuild/images/pkg/distro/host.go b/vendor/github.com/osbuild/images/pkg/distro/host.go -index db1aaea..1c5c6c4 100644 ---- a/vendor/github.com/osbuild/images/pkg/distro/host.go -+++ b/vendor/github.com/osbuild/images/pkg/distro/host.go -@@ -62,6 +62,14 @@ func GetHostDistroName() (string, error) { - } - } - -+ if osrelease["ID"] == "ol" { -+ versionParts := strings.Split(osrelease["VERSION_ID"], ".") -+ if len(versionParts) < 2 { -+ return "", errors.New("failed to parse version from os-release, not enough dotted parts") -+ } -+ return osrelease["ID"] + "-" + versionParts[0], nil -+ } -+ - name := osrelease["ID"] + "-" + osrelease["VERSION_ID"] - - return name, nil --- -2.47.3 - diff --git a/SOURCES/1010-Oscap-customization-for-Oracle-Linux.patch b/SOURCES/1010-Oscap-customization-for-Oracle-Linux.patch deleted file mode 100644 index c2ff370..0000000 --- a/SOURCES/1010-Oscap-customization-for-Oracle-Linux.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 28357b3753a97ceff6fa491745116ca84521fe98 Mon Sep 17 00:00:00 2001 -From: Josue David Hernandez Gutierrez -Date: Fri, 17 Oct 2025 01:15:38 +0000 -Subject: [PATCH 10/10] Oscap customization for Oracle Linux - -Signed-off-by: Josue David Hernandez Gutierrez ---- - .../images/data/distrodefs/rhel-8/imagetypes.yaml | 5 +++++ - .../images/data/distrodefs/rhel-9/imagetypes.yaml | 5 +++++ - .../images/pkg/customizations/oscap/oscap.go | 14 ++++++++++---- - 3 files changed, 20 insertions(+), 4 deletions(-) - -diff --git a/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml b/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml -index 67a189d..af6a4bf 100644 ---- a/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml -+++ b/vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml -@@ -1251,6 +1251,11 @@ image_config: - distro_name: "centos" - shallow_merge: - default_oscap_datastream: "/usr/share/xml/scap/ssg/content/ssg-centos8-ds.xml" -+ "oscap needs a different path on Oracle linux": -+ when: -+ distro_name: "ol" -+ shallow_merge: -+ default_oscap_datastream: "/usr/share/xml/scap/ssg/content/ssg-ol8-ds.xml" - - image_types: - # XXX: not a real pkgset but the "os" pipeline pkgset for image-installer -diff --git a/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml b/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml -index ca61d0d..78735c7 100644 ---- a/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml -+++ b/vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml -@@ -1213,6 +1213,11 @@ image_config: - distro_name: "centos" - shallow_merge: - default_oscap_datastream: "/usr/share/xml/scap/ssg/content/ssg-cs9-ds.xml" -+ "oscap needs a different path on Oracle linux": -+ when: -+ distro_name: "ol" -+ shallow_merge: -+ default_oscap_datastream: "/usr/share/xml/scap/ssg/content/ssg-ol9-ds.xml" - - image_types: - # XXX: not a real pkgset but the "os" pipeline pkgset for image-installer -diff --git a/vendor/github.com/osbuild/images/pkg/customizations/oscap/oscap.go b/vendor/github.com/osbuild/images/pkg/customizations/oscap/oscap.go -index 59fba61..af47a30 100644 ---- a/vendor/github.com/osbuild/images/pkg/customizations/oscap/oscap.go -+++ b/vendor/github.com/osbuild/images/pkg/customizations/oscap/oscap.go -@@ -41,6 +41,8 @@ const ( - defaultCentos8Datastream string = "/usr/share/xml/scap/ssg/content/ssg-centos8-ds.xml" - defaultCentos9Datastream string = "/usr/share/xml/scap/ssg/content/ssg-cs9-ds.xml" - defaultCentos10Datastream string = "/usr/share/xml/scap/ssg/content/ssg-cs10-ds.xml" -+ defaultOL8Datastream string = "/usr/share/xml/scap/ssg/content/ssg-ol8-ds.xml" -+ defaultOL9Datastream string = "/usr/share/xml/scap/ssg/content/ssg-ol9-ds.xml" - defaultRHEL8Datastream string = "/usr/share/xml/scap/ssg/content/ssg-rhel8-ds.xml" - defaultRHEL9Datastream string = "/usr/share/xml/scap/ssg/content/ssg-rhel9-ds.xml" - defaultRHEL10Datastream string = "/usr/share/xml/scap/ssg/content/ssg-rhel10-ds.xml" -@@ -127,16 +129,20 @@ func DefaultFedoraDatastream() string { - return defaultFedoraDatastream - } - --func DefaultRHEL8Datastream(isRHEL bool) string { -- if isRHEL { -+func DefaultRHEL8Datastream(name string) string { -+ if strings.HasPrefix(name, "rhel") { - return defaultRHEL8Datastream -+ } else if strings.HasPrefix(name, "ol") { -+ return defaultOL8Datastream - } - return defaultCentos8Datastream - } - --func DefaultRHEL9Datastream(isRHEL bool) string { -- if isRHEL { -+func DefaultRHEL9Datastream(name string) string { -+ if strings.HasPrefix(name, "rhel") { - return defaultRHEL9Datastream -+ } else if strings.HasPrefix(name, "ol") { -+ return defaultOL9Datastream - } - return defaultCentos9Datastream - } --- -2.47.3 - diff --git a/SPECS/osbuild-composer.spec b/SPECS/osbuild-composer.spec index b5172c9..cf66997 100644 --- a/SPECS/osbuild-composer.spec +++ b/SPECS/osbuild-composer.spec @@ -12,7 +12,7 @@ %global goipath github.com/osbuild/osbuild-composer -Version: 149 +Version: 149 %gometa @@ -25,56 +25,45 @@ It is compatible with composer-cli and cockpit-composer clients. } Name: osbuild-composer -Release: 2.0.1%{?dist} +Release: 2%{?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: enable-bsi-oscap-profile.patch - -Patch1001: 1001-Add-repositories-for-OL-8.10-and-OL-9.6.patch -Patch1002: 1002-Add-support-for-OL-on-osbuild-composer.patch -Patch1003: 1003-Removing-non-supported-image-types.patch -Patch1004: 1004-Fix-packageSets.patch -Patch1005: 1005-Increase-support-for-OCI-images.patch -Patch1006: 1006-Increase-default-boot-size-to-1GB.patch -Patch1007: 1007-Support-using-repository-definitions-with-OCI-variab.patch -Patch1008: 1008-Update-Oracle-repositories-to-contain-OCI-variables.patch -Patch1009: 1009-Simplify-repo-name-removing-minor-versions.patch -Patch1010: 1010-Oscap-customization-for-Oracle-Linux.patch +Patch0: enable-bsi-oscap-profile.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} @@ -168,15 +157,6 @@ install -m 0644 -vp vendor/github.com/osbuild/images/data/repositories/centos-%{ cp -a repositories/centos-stream-%{centos}* %{buildroot}%{_datadir}/osbuild-composer/repositories/ %endif -%else -%if 0%{?oraclelinux} -%if 0%{?oraclelinux} >= 9 -install -m 0644 -vp vendor/github.com/osbuild/images/data/repositories/ol-* %{buildroot}%{_datadir}/osbuild-composer/repositories/ -%else -install -m 0644 -vp vendor/github.com/osbuild/images/data/repositories/ol-%{oraclelinux}* %{buildroot}%{_datadir}/osbuild-composer/repositories/ - -%endif - %else %if 0%{?rhel} @@ -207,7 +187,6 @@ done %endif %endif %endif -%endif # Fedora can build for all included fedora releases %if 0%{?fedora} @@ -328,13 +307,13 @@ cd $PWD/_build/src/%{goipath} %{_sysusersdir}/osbuild-composer.conf %package core -Summary: The core osbuild-composer binary -Requires: osbuild-depsolve-dnf >= %{min_osbuild_version} +Summary: The core osbuild-composer binary +Requires: osbuild-depsolve-dnf >= %{min_osbuild_version} # This version needs to get bumped everytime the osbuild-depsolve-dnf json # API changes in incompatible ways -Requires: osbuild-dnf-json-api = 8 -Provides: %{name}-dnf-json = %{version}-%{release} -Obsoletes: %{name}-dnf-json < %{version}-%{release} +Requires: osbuild-dnf-json-api = 8 +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. @@ -344,16 +323,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 @@ -385,65 +364,65 @@ 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: 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 # podman-plugins has been deprecated since podman version 5.0.0, # which is in Fedora 40+ and in c10s / el10 %if (0%{?rhel} && 0%{?rhel} < 10) || (0%{?fedora} && 0%{?fedora} < 40) -Requires: podman-plugins +Requires: podman-plugins %endif -Requires: dnf-plugins-core -Requires: skopeo -Requires: make -Requires: python3-pip +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 @@ -457,21 +436,6 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog -* Thu Nov 20 2025 Kevin Lyons - 149-2.0.1 -- Add missing dependency over dracut-config-rescue for image-installer [ORABUG: 38587453] -- Switch to UEKR8 repositories for OL9.6 [Orabug: 37962207] -- Add support to create OpenScap images [JIRA: OLDIS-35301] -- Simplify repository names [JIRA: OLDIS-35893] -- Refactor patches to fix some naming and set a correct kernel for Oracle Linux [Orabug: 37253643] -- Support using OCI variables inside built images [JIRA: OLDIS-35302] -- Support using repository definitons with OCI variables [JIRA: OLDIS-38657] -- Update repositories to contain OCI variables -- Remove image types Minimal-raw and wsl [JIRA: OLDIS-38123] -- Increase default /boot size to 1GB [Orabug: 36827079] -- Add support for OCI hybrid images [JIRA: OLDIS-33593] -- enable aarch64 OCI image builds [JIRA: OLDIS-33593] -- support for building OL8/9 images on Oracle Linux 9 [Orabug: 36400619] - * Wed Oct 15 2025 Gianluca Zuccarelli - 149-2 - Add missing BSI OpenSCAP profile to the allowlist Resolves: RHEL-121525