Revert OL modifications
This commit is contained in:
parent
c279aaa49f
commit
17a94543ee
@ -1,174 +0,0 @@
|
||||
From c5b1912c22447b896843a692cf6303c086b89b5f Mon Sep 17 00:00:00 2001
|
||||
From: Josue David Hernandez Gutierrez <josue.d.hernandez@oracle.com>
|
||||
Date: Wed, 30 Oct 2024 17:08:55 +0000
|
||||
Subject: [PATCH 01/10] Add repositories for OL-8.10, OL-9.6 and OL-10.0
|
||||
|
||||
Signed-off-by: Josue David Hernandez Gutierrez <josue.d.hernandez@oracle.com>
|
||||
---
|
||||
.../images/data/repositories/ol-100.json | 48 +++++++++++++++++++
|
||||
.../images/data/repositories/ol-810.json | 42 ++++++++++++++++
|
||||
.../images/data/repositories/ol-96.json | 48 +++++++++++++++++++
|
||||
3 files changed, 138 insertions(+)
|
||||
create mode 100644 vendor/github.com/osbuild/images/data/repositories/ol-100.json
|
||||
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-100.json b/vendor/github.com/osbuild/images/data/repositories/ol-100.json
|
||||
new file mode 100644
|
||||
index 0000000..45ac9c0
|
||||
--- /dev/null
|
||||
+++ b/vendor/github.com/osbuild/images/data/repositories/ol-100.json
|
||||
@@ -0,0 +1,48 @@
|
||||
+{
|
||||
+ "aarch64": [
|
||||
+ {
|
||||
+ "name": "baseos",
|
||||
+ "baseurl": "https://yum-qa.oracle.com/repo/OracleLinux/OL10/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": false,
|
||||
+ "rhsm": false
|
||||
+ },
|
||||
+ {
|
||||
+ "name": "uekr8",
|
||||
+ "baseurl": "https://yum-qa.oracle.com/repo/OracleLinux/OL10/UEKR8/aarch64/",
|
||||
+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n=0hyN\n-----END PGP PUBLIC KEY BLOCK-----",
|
||||
+ "check_gpg": false,
|
||||
+ "rhsm": false
|
||||
+ },
|
||||
+ {
|
||||
+ "name": "appstream",
|
||||
+ "baseurl": "https://yum-qa.oracle.com/repo/OracleLinux/OL10/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": false,
|
||||
+ "rhsm": false
|
||||
+ }
|
||||
+ ],
|
||||
+ "x86_64": [
|
||||
+ {
|
||||
+ "name": "baseos",
|
||||
+ "baseurl": "https://yum-qa.oracle.com/repo/OracleLinux/OL10/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": false,
|
||||
+ "rhsm": false
|
||||
+ },
|
||||
+ {
|
||||
+ "name": "uekr8",
|
||||
+ "baseurl": "https://yum-qa.oracle.com/repo/OracleLinux/OL10/UEKR8/x86_64/",
|
||||
+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n=0hyN\n-----END PGP PUBLIC KEY BLOCK-----",
|
||||
+ "check_gpg": false,
|
||||
+ "rhsm": false
|
||||
+ },
|
||||
+ {
|
||||
+ "name": "appstream",
|
||||
+ "baseurl": "https://yum-qa.oracle.com/repo/OracleLinux/OL10/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": false,
|
||||
+ "rhsm": false
|
||||
+ }
|
||||
+ ]
|
||||
+}
|
||||
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..08b877e
|
||||
--- /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": "uekr7",
|
||||
+ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/UEKR7/aarch64/",
|
||||
+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----",
|
||||
+ "check_gpg": true,
|
||||
+ "rhsm": false
|
||||
+ },
|
||||
+ {
|
||||
+ "name": "appstream",
|
||||
+ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/appstream/aarch64",
|
||||
+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----",
|
||||
+ "check_gpg": true,
|
||||
+ "rhsm": false
|
||||
+ }
|
||||
+ ],
|
||||
+ "x86_64": [
|
||||
+ {
|
||||
+ "name": "baseos",
|
||||
+ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/x86_64",
|
||||
+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----",
|
||||
+ "check_gpg": true,
|
||||
+ "rhsm": false
|
||||
+ },
|
||||
+ {
|
||||
+ "name": "uekr7",
|
||||
+ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/UEKR7/x86_64/",
|
||||
+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----",
|
||||
+ "check_gpg": true,
|
||||
+ "rhsm": false
|
||||
+ },
|
||||
+ {
|
||||
+ "name": "appstream",
|
||||
+ "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/appstream/x86_64",
|
||||
+ "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
|
||||
|
||||
@ -1,232 +0,0 @@
|
||||
From c166c9145f9d82225a9795d789546cd2753da3d8 Mon Sep 17 00:00:00 2001
|
||||
From: Josue David Hernandez Gutierrez <josue.d.hernandez@oracle.com>
|
||||
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 <josue.d.hernandez@oracle.com>
|
||||
---
|
||||
internal/runner/ol.go | 18 ++++++++
|
||||
.../blueprint/pkg/blueprint/customizations.go | 2 +-
|
||||
.../images/data/distrodefs/distros.yaml | 45 +++++++++++++++++++
|
||||
.../data/distrodefs/rhel-10/imagetypes.yaml | 6 +++
|
||||
.../data/distrodefs/rhel-8/imagetypes.yaml | 15 +++++++
|
||||
.../data/distrodefs/rhel-9/imagetypes.yaml | 12 +++++
|
||||
.../osbuild/images/pkg/runner/ol.go | 18 ++++++++
|
||||
7 files changed, 115 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..c16e6ad 100644
|
||||
--- a/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml
|
||||
+++ b/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml
|
||||
@@ -165,6 +165,21 @@ distros:
|
||||
vendor: "almalinux"
|
||||
ostree_ref_tmpl: "almalinux/10/%s/edge"
|
||||
|
||||
+ - &ol10
|
||||
+ <<: *rhel10
|
||||
+ name: "ol-{{.MajorVersion}}.{{.MinorVersion}}"
|
||||
+ match: '(?P<name>ol)-(?P<major>10)\.?(?P<minor>[0-9]{1,2})'
|
||||
+ product: "Oracle Linux"
|
||||
+ os_version: "{{.MajorVersion}}.{{.MinorVersion}}"
|
||||
+ release_version: 10
|
||||
+ module_platform_id: "platform:el10"
|
||||
+ vendor: "redhat"
|
||||
+ ostree_ref_tmpl: "ol/10/%s/edge"
|
||||
+ iso_label_tmpl: "OracleLinux-{{.Distro.MajorVersion}}-{{.Distro.MinorVersion}}-{{.Arch}}-dvd"
|
||||
+ runner:
|
||||
+ build_packages: *rhel10_runner_build_packages
|
||||
+ name: org.osbuild.ol
|
||||
+
|
||||
- &rhel9
|
||||
name: "rhel-{{.MajorVersion}}.{{.MinorVersion}}"
|
||||
# rhel9 support being named "rhel-91" for "rhel-9.1" or "rhel-910" for "rhel-9.10" etc
|
||||
@@ -257,6 +272,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: '(?P<name>ol)-(?P<major>9)\.?(?P<minor>[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 +374,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: '(?P<name>ol)-(?P<major>8)\.?(?P<minor>[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-10/imagetypes.yaml b/vendor/github.com/osbuild/images/data/distrodefs/rhel-10/imagetypes.yaml
|
||||
index 3091616..ff7d82e 100644
|
||||
--- a/vendor/github.com/osbuild/images/data/distrodefs/rhel-10/imagetypes.yaml
|
||||
+++ b/vendor/github.com/osbuild/images/data/distrodefs/rhel-10/imagetypes.yaml
|
||||
@@ -1708,6 +1708,12 @@ image_types:
|
||||
append:
|
||||
include:
|
||||
- "dmidecode"
|
||||
+ "ol kernel":
|
||||
+ when:
|
||||
+ distro_name: "ol"
|
||||
+ append:
|
||||
+ include:
|
||||
+ - "kernel-uek"
|
||||
|
||||
gce:
|
||||
# this image type is set to `gcp` in image-builder-crc
|
||||
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
|
||||
|
||||
@ -1,125 +0,0 @@
|
||||
From faef0bf6142c92575b5da836d47674916173cc4e Mon Sep 17 00:00:00 2001
|
||||
From: Josue David Hernandez Gutierrez <josue.d.hernandez@oracle.com>
|
||||
Date: Fri, 17 Oct 2025 00:41:35 +0000
|
||||
Subject: [PATCH 03/10] Remove unsopported image types
|
||||
|
||||
Signed-off-by: Josue David Hernandez Gutierrez <josue.d.hernandez@oracle.com>
|
||||
---
|
||||
.../images/data/distrodefs/distros.yaml | 87 +++++++++++++++++++
|
||||
1 file changed, 87 insertions(+)
|
||||
|
||||
diff --git a/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml b/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml
|
||||
index 1503a3b..0ecf79e 100644
|
||||
--- a/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml
|
||||
+++ b/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml
|
||||
@@ -178,6 +178,35 @@ distros:
|
||||
runner:
|
||||
build_packages: *rhel10_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
|
||||
|
||||
- &rhel9
|
||||
name: "rhel-{{.MajorVersion}}.{{.MinorVersion}}"
|
||||
@@ -284,6 +313,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}}"
|
||||
@@ -385,6 +443,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
|
||||
|
||||
@ -1,394 +0,0 @@
|
||||
From 0e66e4d92cb58e45fad672ea2c29955464b6df8b Mon Sep 17 00:00:00 2001
|
||||
From: Josue David Hernandez Gutierrez <josue.d.hernandez@oracle.com>
|
||||
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 <josue.d.hernandez@oracle.com>
|
||||
---
|
||||
.../data/distrodefs/rhel-10/imagetypes.yaml | 42 +++++++++++++----
|
||||
.../data/distrodefs/rhel-8/imagetypes.yaml | 37 ++++++++++++---
|
||||
.../data/distrodefs/rhel-9/imagetypes.yaml | 45 ++++++++++++++++---
|
||||
3 files changed, 101 insertions(+), 23 deletions(-)
|
||||
|
||||
diff --git a/vendor/github.com/osbuild/images/data/distrodefs/rhel-10/imagetypes.yaml b/vendor/github.com/osbuild/images/data/distrodefs/rhel-10/imagetypes.yaml
|
||||
index ff7d82e..48c4925 100644
|
||||
--- a/vendor/github.com/osbuild/images/data/distrodefs/rhel-10/imagetypes.yaml
|
||||
+++ b/vendor/github.com/osbuild/images/data/distrodefs/rhel-10/imagetypes.yaml
|
||||
@@ -688,7 +688,6 @@
|
||||
- "buildah"
|
||||
- "cockpit-podman"
|
||||
- "containernetworking-plugins"
|
||||
- - "dnf-plugin-spacewalk"
|
||||
- "dracut-config-rescue"
|
||||
- "glibc-all-langpacks"
|
||||
- "iprutils"
|
||||
@@ -716,7 +715,6 @@
|
||||
- "NetworkManager-config-server"
|
||||
- "plymouth"
|
||||
- "podman"
|
||||
- - "python3-dnf-plugin-spacewalk"
|
||||
- "python3-hwdata"
|
||||
- "python3-rhnlib"
|
||||
- "rhn-check"
|
||||
@@ -790,13 +788,10 @@ image_types:
|
||||
- "python3-jsonschema"
|
||||
- "qemu-guest-agent"
|
||||
- "redhat-release"
|
||||
- - "redhat-release-eula"
|
||||
- "rsync"
|
||||
- "tar"
|
||||
- "tcpdump"
|
||||
- "tuned"
|
||||
- exclude:
|
||||
- - "dracut-config-rescue"
|
||||
conditions:
|
||||
"add subscription-manager-cockpit on rhel":
|
||||
when:
|
||||
@@ -804,6 +799,15 @@ image_types:
|
||||
append:
|
||||
include:
|
||||
- "subscription-manager-cockpit"
|
||||
+ "include and exclude pkgs for non oracle linux":
|
||||
+ when:
|
||||
+ not_distro_name: "ol"
|
||||
+ append:
|
||||
+ include:
|
||||
+ - "redhat-release-eula"
|
||||
+ exclude:
|
||||
+ - "dracut-config-rescue"
|
||||
+
|
||||
|
||||
qcow2: &qcow2
|
||||
name_aliases: ["guest-image"]
|
||||
@@ -861,7 +865,6 @@ image_types:
|
||||
- "python3-jsonschema"
|
||||
- "qemu-guest-agent"
|
||||
- "redhat-release"
|
||||
- - "redhat-release-eula"
|
||||
- "rsync"
|
||||
- "system-reinstall-bootc"
|
||||
- "tar"
|
||||
@@ -873,7 +876,6 @@ image_types:
|
||||
- "alsa-lib"
|
||||
- "alsa-tools-firmware"
|
||||
- "biosdevname"
|
||||
- - "dnf-plugin-spacewalk"
|
||||
- "dracut-config-rescue"
|
||||
- "fedora-release"
|
||||
- "fedora-repos"
|
||||
@@ -910,6 +912,12 @@ image_types:
|
||||
include:
|
||||
- "insights-client"
|
||||
- "subscription-manager-cockpit"
|
||||
+ "include redhat-release-eula for non oracle linux":
|
||||
+ when:
|
||||
+ not_distro_name: "ol"
|
||||
+ append:
|
||||
+ include:
|
||||
+ - "redhat-release-eula"
|
||||
|
||||
"vagrant-libvirt": &vagrant_libvirt
|
||||
<<: *qcow2
|
||||
@@ -1326,7 +1334,6 @@ image_types:
|
||||
- "langpacks-en"
|
||||
- "NetworkManager-cloud-setup"
|
||||
- "redhat-release"
|
||||
- - "redhat-release-eula"
|
||||
- "rsync"
|
||||
- "system-reinstall-bootc"
|
||||
- "tuned"
|
||||
@@ -1370,6 +1377,12 @@ image_types:
|
||||
append:
|
||||
include:
|
||||
- "insights-client"
|
||||
+ "include redhat-release-eula for non oracle linux":
|
||||
+ when:
|
||||
+ not_distro_name: "ol"
|
||||
+ append:
|
||||
+ include:
|
||||
+ - "redhat-release-eula"
|
||||
|
||||
# RHEL internal-only x86_64 EC2 image type
|
||||
ec2: &ec2
|
||||
@@ -1669,7 +1682,6 @@ image_types:
|
||||
- "prefixdevname"
|
||||
- "python3-pyatspi"
|
||||
- "rdma-core"
|
||||
- - "redhat-release-eula"
|
||||
- "rng-tools"
|
||||
- "rpcbind"
|
||||
- "rpm-ostree"
|
||||
@@ -1714,6 +1726,18 @@ image_types:
|
||||
append:
|
||||
include:
|
||||
- "kernel-uek"
|
||||
+ "add dracut-config-rescue for ol installer":
|
||||
+ when:
|
||||
+ distro_name: "ol"
|
||||
+ append:
|
||||
+ include:
|
||||
+ - "dracut-config-rescue"
|
||||
+ "include redhat-release-eula for non oracle linux":
|
||||
+ when:
|
||||
+ not_distro_name: "ol"
|
||||
+ append:
|
||||
+ include:
|
||||
+ - "redhat-release-eula"
|
||||
|
||||
gce:
|
||||
# this image type is set to `gcp` in image-builder-crc
|
||||
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..0f00095 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"
|
||||
@@ -469,6 +472,12 @@
|
||||
append:
|
||||
include:
|
||||
- "kernel-uek"
|
||||
+ "add dracut-config-rescue for ol installer":
|
||||
+ when:
|
||||
+ distro_name: "ol"
|
||||
+ append:
|
||||
+ include:
|
||||
+ - "dracut-config-rescue"
|
||||
|
||||
|
||||
anaconda_boot_pkgset: &anaconda_boot_pkgset
|
||||
@@ -593,7 +602,6 @@
|
||||
- "pigz"
|
||||
- "python3-pyatspi"
|
||||
- "rdma-core"
|
||||
- - "redhat-release-eula"
|
||||
- "rpm-ostree"
|
||||
- "rsync"
|
||||
- "rsyslog"
|
||||
@@ -638,6 +646,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 +740,6 @@
|
||||
- "python3-jsonschema"
|
||||
- "qemu-guest-agent"
|
||||
- "redhat-release"
|
||||
- - "redhat-release-eula"
|
||||
- "rsync"
|
||||
- "tar"
|
||||
- "tcpdump"
|
||||
@@ -737,7 +750,6 @@
|
||||
- "alsa-lib"
|
||||
- "alsa-tools-firmware"
|
||||
- "biosdevname"
|
||||
- - "dnf-plugin-spacewalk"
|
||||
- "dracut-config-rescue"
|
||||
- "fedora-release"
|
||||
- "fedora-repos"
|
||||
@@ -779,6 +791,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 +1310,12 @@ 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"
|
||||
|
||||
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..212cc0a 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"
|
||||
@@ -452,6 +458,12 @@
|
||||
append:
|
||||
include:
|
||||
- "kernel-uek"
|
||||
+ "add dracut-config-rescue for ol installer":
|
||||
+ when:
|
||||
+ distro_name: "ol"
|
||||
+ append:
|
||||
+ include:
|
||||
+ - "dracut-config-rescue"
|
||||
|
||||
wsl: &wsl_config
|
||||
config:
|
||||
@@ -604,7 +616,6 @@
|
||||
- "prefixdevname"
|
||||
- "python3-pyatspi"
|
||||
- "rdma-core"
|
||||
- - "redhat-release-eula"
|
||||
- "rng-tools"
|
||||
- "rpcbind"
|
||||
- "rpm-ostree"
|
||||
@@ -654,7 +665,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 +1260,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 +1271,14 @@ image_types:
|
||||
append:
|
||||
include:
|
||||
- "subscription-manager-cockpit"
|
||||
+ "include redhat-release-eula 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
|
||||
|
||||
@ -1,631 +0,0 @@
|
||||
From 5aeee70fd36718597f62795db0ce5e3df805739c Mon Sep 17 00:00:00 2001
|
||||
From: Josue David Hernandez Gutierrez <josue.d.hernandez@oracle.com>
|
||||
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 <josue.d.hernandez@oracle.com>
|
||||
---
|
||||
.../data/distrodefs/rhel-10/imagetypes.yaml | 167 +++++++++++++++++
|
||||
.../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 +-
|
||||
6 files changed, 518 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/vendor/github.com/osbuild/images/data/distrodefs/rhel-10/imagetypes.yaml b/vendor/github.com/osbuild/images/data/distrodefs/rhel-10/imagetypes.yaml
|
||||
index b4ec077..b903e6e 100644
|
||||
--- a/vendor/github.com/osbuild/images/data/distrodefs/rhel-10/imagetypes.yaml
|
||||
+++ b/vendor/github.com/osbuild/images/data/distrodefs/rhel-10/imagetypes.yaml
|
||||
@@ -967,6 +967,173 @@ 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/OL10/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 <<EOF > /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-el10
|
||||
+ 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=2G-8G:256M,8G-512G:1G,512G-:3G"
|
||||
+ - "LANG=en_US.UTF-8"
|
||||
+ - "console=ttyAMA0"
|
||||
+ - "console=ttyAMA0,115200"
|
||||
+ package_sets:
|
||||
+ os:
|
||||
+ - *qcow2_pkgset
|
||||
+ - 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/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 <<EOF > /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 <<EOF > /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
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
From 271ba461db89382f99e1524be2fb4b352a238f03 Mon Sep 17 00:00:00 2001
|
||||
From: Josue David Hernandez Gutierrez <josue.d.hernandez@oracle.com>
|
||||
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 <josue.d.hernandez@oracle.com>
|
||||
Signed-off-by: Alex Burmashev <alexander.burmashev@oracle.com>
|
||||
---
|
||||
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
|
||||
|
||||
@ -1,85 +0,0 @@
|
||||
From 90ce1614e0c2d416c53c684471c3b7f4ae66e393 Mon Sep 17 00:00:00 2001
|
||||
From: Josue David Hernandez Gutierrez <josue.d.hernandez@oracle.com>
|
||||
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 <alexander.burmashev@oracle.com>
|
||||
Signed-off-by: Josue David Hernandez Gutierrez <josue.d.hernandez@oracle.com>
|
||||
---
|
||||
.../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
|
||||
|
||||
@ -1,176 +0,0 @@
|
||||
From 719df493a81a0d5f53fe8788cabde0cb672422e6 Mon Sep 17 00:00:00 2001
|
||||
From: Josue David Hernandez Gutierrez <josue.d.hernandez@oracle.com>
|
||||
Date: Fri, 17 Oct 2025 19:18:07 +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 <alexander.burmashev@oracle.com>
|
||||
Signed-off-by: Josue David Hernandez Gutierrez <josue.d.hernandez@oracle.com>
|
||||
---
|
||||
.../osbuild/images/data/repositories/ol-100.json | 12 ++++++------
|
||||
.../osbuild/images/data/repositories/ol-810.json | 12 ++++++------
|
||||
.../osbuild/images/data/repositories/ol-96.json | 12 ++++++------
|
||||
3 files changed, 18 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/vendor/github.com/osbuild/images/data/repositories/ol-100.json b/vendor/github.com/osbuild/images/data/repositories/ol-100.json
|
||||
index 45ac9c0..9f1e82c 100644
|
||||
--- a/vendor/github.com/osbuild/images/data/repositories/ol-100.json
|
||||
+++ b/vendor/github.com/osbuild/images/data/repositories/ol-100.json
|
||||
@@ -2,21 +2,21 @@
|
||||
"aarch64": [
|
||||
{
|
||||
"name": "baseos",
|
||||
- "baseurl": "https://yum-qa.oracle.com/repo/OracleLinux/OL10/baseos/latest/aarch64",
|
||||
+ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL10/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": false,
|
||||
"rhsm": false
|
||||
},
|
||||
{
|
||||
"name": "uekr8",
|
||||
- "baseurl": "https://yum-qa.oracle.com/repo/OracleLinux/OL10/UEKR8/aarch64/",
|
||||
+ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL10/UEKR8/aarch64/",
|
||||
"gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n=0hyN\n-----END PGP PUBLIC KEY BLOCK-----",
|
||||
"check_gpg": false,
|
||||
"rhsm": false
|
||||
},
|
||||
{
|
||||
"name": "appstream",
|
||||
- "baseurl": "https://yum-qa.oracle.com/repo/OracleLinux/OL10/appstream/aarch64",
|
||||
+ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL10/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": false,
|
||||
"rhsm": false
|
||||
@@ -25,21 +25,21 @@
|
||||
"x86_64": [
|
||||
{
|
||||
"name": "baseos",
|
||||
- "baseurl": "https://yum-qa.oracle.com/repo/OracleLinux/OL10/baseos/latest/x86_64",
|
||||
+ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL10/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": false,
|
||||
"rhsm": false
|
||||
},
|
||||
{
|
||||
"name": "uekr8",
|
||||
- "baseurl": "https://yum-qa.oracle.com/repo/OracleLinux/OL10/UEKR8/x86_64/",
|
||||
+ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL10/UEKR8/x86_64/",
|
||||
"gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n=0hyN\n-----END PGP PUBLIC KEY BLOCK-----",
|
||||
"check_gpg": false,
|
||||
"rhsm": false
|
||||
},
|
||||
{
|
||||
"name": "appstream",
|
||||
- "baseurl": "https://yum-qa.oracle.com/repo/OracleLinux/OL10/appstream/x86_64",
|
||||
+ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL10/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": false,
|
||||
"rhsm": false
|
||||
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 08b877e..df1c369 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": "uekr7",
|
||||
- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/UEKR7/aarch64/",
|
||||
+ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/UEKR7/aarch64/",
|
||||
"gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----",
|
||||
"check_gpg": true,
|
||||
"rhsm": false
|
||||
},
|
||||
{
|
||||
"name": "appstream",
|
||||
- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/appstream/aarch64",
|
||||
+ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/appstream/aarch64",
|
||||
"gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----",
|
||||
"check_gpg": true,
|
||||
"rhsm": false
|
||||
@@ -25,21 +25,21 @@
|
||||
"x86_64": [
|
||||
{
|
||||
"name": "baseos",
|
||||
- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/x86_64",
|
||||
+ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/baseos/latest/x86_64",
|
||||
"gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----",
|
||||
"check_gpg": true,
|
||||
"rhsm": false
|
||||
},
|
||||
{
|
||||
"name": "uekr7",
|
||||
- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/UEKR7/x86_64/",
|
||||
+ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/UEKR7/x86_64/",
|
||||
"gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----",
|
||||
"check_gpg": true,
|
||||
"rhsm": false
|
||||
},
|
||||
{
|
||||
"name": "appstream",
|
||||
- "baseurl": "https://yum.oracle.com/repo/OracleLinux/OL9/appstream/x86_64",
|
||||
+ "baseurl": "https://yum$ociregion.$ocidomain/repo/OracleLinux/OL9/appstream/x86_64",
|
||||
"gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n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\n4QrtLe//99hXPcFVanIxgkdslnyYf4fjdbdlmNY=\n=xpaH\n-----END PGP PUBLIC KEY BLOCK-----",
|
||||
"check_gpg": true,
|
||||
"rhsm": false
|
||||
--
|
||||
2.47.3
|
||||
|
||||
@ -1,99 +0,0 @@
|
||||
From 9b486d54abfcdcdd8c405f1e58a031a44ff181ac Mon Sep 17 00:00:00 2001
|
||||
From: Josue David Hernandez Gutierrez <josue.d.hernandez@oracle.com>
|
||||
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 <josue.d.hernandez@oracle.com>
|
||||
---
|
||||
.../images/data/distrodefs/distros.yaml | 18 +++++++++---------
|
||||
.../repositories/{ol-100.json => ol-10.json} | 0
|
||||
.../repositories/{ol-810.json => ol-8.json} | 0
|
||||
.../repositories/{ol-96.json => ol-9.json} | 0
|
||||
.../osbuild/images/pkg/distro/host.go | 8 ++++++++
|
||||
5 files changed, 17 insertions(+), 9 deletions(-)
|
||||
rename vendor/github.com/osbuild/images/data/repositories/{ol-100.json => ol-10.json} (100%)
|
||||
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 0ecf79e..1b3b44f 100644
|
||||
--- a/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml
|
||||
+++ b/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml
|
||||
@@ -167,10 +167,10 @@ distros:
|
||||
|
||||
- &ol10
|
||||
<<: *rhel10
|
||||
- name: "ol-{{.MajorVersion}}.{{.MinorVersion}}"
|
||||
- match: '(?P<name>ol)-(?P<major>10)\.?(?P<minor>[0-9]{1,2})'
|
||||
+ name: "ol-{{.MajorVersion}}"
|
||||
+ match: '(?P<name>ol)-(?P<major>10)'
|
||||
product: "Oracle Linux"
|
||||
- os_version: "{{.MajorVersion}}.{{.MinorVersion}}"
|
||||
+ os_version: "{{.MajorVersion}}"
|
||||
release_version: 10
|
||||
module_platform_id: "platform:el10"
|
||||
vendor: "redhat"
|
||||
@@ -302,10 +302,10 @@ distros:
|
||||
|
||||
- &ol9
|
||||
<<: *rhel9
|
||||
- name: "ol-{{.MajorVersion}}.{{.MinorVersion}}"
|
||||
- match: '(?P<name>ol)-(?P<major>9)\.?(?P<minor>[0-9]{1,2})'
|
||||
+ name: "ol-{{.MajorVersion}}"
|
||||
+ match: '(?P<name>ol)-(?P<major>9)'
|
||||
product: "Oracle Linux"
|
||||
- os_version: "{{.MajorVersion}}.{{.MinorVersion}}"
|
||||
+ os_version: "{{.MajorVersion}}"
|
||||
release_version: 9
|
||||
module_platform_id: "platform:el9"
|
||||
vendor: "redhat"
|
||||
@@ -432,10 +432,10 @@ distros:
|
||||
|
||||
- &ol8
|
||||
<<: *rhel8
|
||||
- name: "ol-{{.MajorVersion}}.{{.MinorVersion}}"
|
||||
- match: '(?P<name>ol)-(?P<major>8)\.?(?P<minor>[0-9]{1,2})'
|
||||
+ name: "ol-{{.MajorVersion}}"
|
||||
+ match: '(?P<name>ol)-(?P<major>8)'
|
||||
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-100.json b/vendor/github.com/osbuild/images/data/repositories/ol-10.json
|
||||
similarity index 100%
|
||||
rename from vendor/github.com/osbuild/images/data/repositories/ol-100.json
|
||||
rename to vendor/github.com/osbuild/images/data/repositories/ol-10.json
|
||||
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
|
||||
|
||||
@ -1,114 +0,0 @@
|
||||
From 996e85b4f8855af92c587ed562ebe7cf7105e2f0 Mon Sep 17 00:00:00 2001
|
||||
From: Josue David Hernandez Gutierrez <josue.d.hernandez@oracle.com>
|
||||
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 <josue.d.hernandez@oracle.com>
|
||||
---
|
||||
.../data/distrodefs/rhel-10/imagetypes.yaml | 5 +++++
|
||||
.../data/distrodefs/rhel-8/imagetypes.yaml | 5 +++++
|
||||
.../data/distrodefs/rhel-9/imagetypes.yaml | 5 +++++
|
||||
.../images/pkg/customizations/oscap/oscap.go | 21 +++++++++++++------
|
||||
4 files changed, 30 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/vendor/github.com/osbuild/images/data/distrodefs/rhel-10/imagetypes.yaml b/vendor/github.com/osbuild/images/data/distrodefs/rhel-10/imagetypes.yaml
|
||||
index 1e9f114..8cea1b9 100644
|
||||
--- a/vendor/github.com/osbuild/images/data/distrodefs/rhel-10/imagetypes.yaml
|
||||
+++ b/vendor/github.com/osbuild/images/data/distrodefs/rhel-10/imagetypes.yaml
|
||||
@@ -749,6 +749,11 @@ image_config:
|
||||
distro_name: "centos"
|
||||
shallow_merge:
|
||||
default_oscap_datastream: "/usr/share/xml/scap/ssg/content/ssg-cs10-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-ol10-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-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..889f20a 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,9 @@ 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"
|
||||
+ defaultOL10Datastream string = "/usr/share/xml/scap/ssg/content/ssg-ol10-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,23 +130,29 @@ 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
|
||||
}
|
||||
|
||||
-func DefaultRHEL10Datastream(isRHEL bool) string {
|
||||
- if isRHEL {
|
||||
+func DefaultRHEL10Datastream(name string) string {
|
||||
+ if strings.HasPrefix(name, "rhel") {
|
||||
return defaultRHEL10Datastream
|
||||
+ } else if strings.HasPrefix(name, "ol") {
|
||||
+ return defaultOL10Datastream
|
||||
}
|
||||
return defaultCentos10Datastream
|
||||
}
|
||||
--
|
||||
2.47.3
|
||||
|
||||
@ -25,7 +25,7 @@ It is compatible with composer-cli and cockpit-composer clients.
|
||||
}
|
||||
|
||||
Name: osbuild-composer
|
||||
Release: 6.0.1%{?dist}
|
||||
Release: 6%{?dist}
|
||||
Summary: An image building service based on osbuild
|
||||
|
||||
# osbuild-composer doesn't have support for building i686 and armv7hl images
|
||||
@ -35,16 +35,6 @@ ExcludeArch: i686 armv7hl
|
||||
License: Apache-2.0
|
||||
URL: %{gourl}
|
||||
Source0: %{gosource}
|
||||
Patch1001: 1001-Add-repositories-for-OL-8.10-OL-9.6-and-OL-10.0.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: 0001-go.mod-update-osbuild-images-to-v0.178.2.patch
|
||||
|
||||
@ -166,15 +156,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}
|
||||
@ -205,7 +186,6 @@ done
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
|
||||
# Fedora can build for all included fedora releases
|
||||
%if 0%{?fedora}
|
||||
@ -455,23 +435,6 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue May 05 2026 EL Errata <el-errata_ww@oracle.com> - 149-6.0.1
|
||||
- Add missing dependency over dracut-config-rescue for image-installer [Orabug: 38587453]
|
||||
- Add OL10 support
|
||||
- Update repository URLs for baseos, appstream and UERK
|
||||
- Fix the label for UEKR repository
|
||||
- Simplify repository names [JIRA: OLDIS-35893]
|
||||
- Ensure build on latest golang: CVE-2024-34156
|
||||
- Refactor patches to fix some naming and set a correct kernel for Oracle Linux [Orabug: 37253643]
|
||||
- Support using OCI variables inside built images [JIRA: OLDIS-35302]
|
||||
- Support using repository definitons with OCI variables [JIRA: OLDIS-38657]
|
||||
- Update repositories to contain OCI variables
|
||||
- Remove image types Minimal-raw and wsl [JIRA: OLDIS-38123]
|
||||
- Increase default /boot size to 1GB [Orabug: 36827079]
|
||||
- Add support for OCI hybrid images [JIRA: OLDIS-33593]
|
||||
- enable aarch64 OCI image builds [JIRA: OLDIS-33593]
|
||||
- support for building OL8/9 images on Oracle Linux 9 [Orabug: 36400619]
|
||||
|
||||
* Wed Apr 15 2026 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 149-6
|
||||
- Rebuilt to fix:
|
||||
- CVE-2026-25679
|
||||
|
||||
Loading…
Reference in New Issue
Block a user