395 lines
12 KiB
Diff
395 lines
12 KiB
Diff
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
|
|
|