osbuild-composer/SOURCES/1004-Fix-packageSets.patch

185 lines
6.9 KiB
Diff

From 5277761c827d3c8b86544a6e960f53c6f3462450 Mon Sep 17 00:00:00 2001
From: Josue David Hernandez Gutierrez <josue.d.hernandez@oracle.com>
Date: Thu, 31 Oct 2024 03:46:51 +0000
Subject: [PATCH 4/8] Fix packageSets
Signed-off-by: Josue David Hernandez Gutierrez <josue.d.hernandez@oracle.com>
---
.../github.com/osbuild/images/pkg/distro/rhel/rhel8/ami.go | 1 -
.../osbuild/images/pkg/distro/rhel/rhel8/bare_metal.go | 3 ---
.../osbuild/images/pkg/distro/rhel/rhel8/qcow2.go | 2 --
.../github.com/osbuild/images/pkg/distro/rhel/rhel8/ubi.go | 2 --
.../github.com/osbuild/images/pkg/distro/rhel/rhel9/ami.go | 1 -
.../osbuild/images/pkg/distro/rhel/rhel9/bare_metal.go | 7 ++-----
.../osbuild/images/pkg/distro/rhel/rhel9/qcow2.go | 5 ++++-
.../github.com/osbuild/images/pkg/distro/rhel/rhel9/ubi.go | 1 -
8 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/ami.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/ami.go
index 12f8043..7860629 100644
--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/ami.go
+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/ami.go
@@ -343,7 +343,6 @@ func ec2CommonPackageSet(t *rhel.ImageType) rpmmd.PackageSet {
"NetworkManager",
"NetworkManager-cloud-setup",
"redhat-release",
- "redhat-release-eula",
"rsync",
"tar",
"yum-utils",
diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/bare_metal.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/bare_metal.go
index 0d5fbe0..cc463a0 100644
--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/bare_metal.go
+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/bare_metal.go
@@ -100,7 +100,6 @@ func bareMetalPackageSet(t *rhel.ImageType) rpmmd.PackageSet {
"python3-jsonschema",
"qemu-guest-agent",
"redhat-release",
- "redhat-release-eula",
"rsync",
"selinux-policy-targeted",
"tar",
@@ -228,7 +227,6 @@ func anacondaPackageSet(t *rhel.ImageType) rpmmd.PackageSet {
"libibverbs",
"libreport-plugin-bugzilla",
"libreport-plugin-reportuploader",
- "libreport-rhel-anaconda-bugzilla",
"librsvg2",
"linux-firmware",
"lklug-fonts",
@@ -258,7 +256,6 @@ func anacondaPackageSet(t *rhel.ImageType) rpmmd.PackageSet {
"pigz",
"python3-pyatspi",
"rdma-core",
- "redhat-release-eula",
"rpm-ostree",
"rsync",
"rsyslog",
diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/qcow2.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/qcow2.go
index a00c516..12a4a07 100644
--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/qcow2.go
+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/qcow2.go
@@ -100,7 +100,6 @@ func qcow2CommonPackageSet(t *rhel.ImageType) rpmmd.PackageSet {
"python3-jsonschema",
"qemu-guest-agent",
"redhat-release",
- "redhat-release-eula",
"rsync",
"tar",
"tcpdump",
@@ -112,7 +111,6 @@ func qcow2CommonPackageSet(t *rhel.ImageType) rpmmd.PackageSet {
"alsa-lib",
"alsa-tools-firmware",
"biosdevname",
- "dnf-plugin-spacewalk",
"dracut-config-rescue",
"fedora-release",
"fedora-repos",
diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/ubi.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/ubi.go
index acb08cc..d21a5c4 100644
--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/ubi.go
+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/ubi.go
@@ -88,7 +88,6 @@ func ubiCommonPackageSet(t *rhel.ImageType) rpmmd.PackageSet {
"biosdevname",
"cpio",
"diffutils",
- "dnf-plugin-spacewalk",
"dracut",
"elfutils-debuginfod-client",
"fedora-release",
@@ -125,7 +124,6 @@ func ubiCommonPackageSet(t *rhel.ImageType) rpmmd.PackageSet {
"plymouth",
"policycoreutils",
"python3-unbound",
- "redhat-release-eula",
"rng-tools",
"rpm-plugin-selinux",
"rpm-plugin-systemd-inhibit",
diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/ami.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/ami.go
index 5f5cf3f..255fe24 100644
--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/ami.go
+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/ami.go
@@ -200,7 +200,6 @@ func ec2CommonPackageSet(t *rhel.ImageType) rpmmd.PackageSet {
"langpacks-en",
"NetworkManager-cloud-setup",
"redhat-release",
- "redhat-release-eula",
"rsync",
"tuned",
"tar",
diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/bare_metal.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/bare_metal.go
index 22807f3..3b89260 100644
--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/bare_metal.go
+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/bare_metal.go
@@ -101,15 +101,12 @@ func bareMetalPackageSet(t *rhel.ImageType) rpmmd.PackageSet {
"python3-jsonschema",
"qemu-guest-agent",
"redhat-release",
- "redhat-release-eula",
"rsync",
"tar",
"tcpdump",
"tuned",
},
- Exclude: []string{
- "dracut-config-rescue",
- },
+ Exclude: nil,
}.Append(distroBuildPackageSet(t))
if common.VersionLessThan(t.Arch().Distro().OsVersion(), "10.0") {
@@ -134,6 +131,7 @@ func installerPackageSet(t *rhel.ImageType) rpmmd.PackageSet {
"anaconda-dracut",
"curl",
"dracut-config-generic",
+ "dracut-config-rescue",
"dracut-network",
"hostname",
"iwl100-firmware",
@@ -297,7 +295,6 @@ func anacondaPackageSet(t *rhel.ImageType) rpmmd.PackageSet {
"prefixdevname",
"python3-pyatspi",
"rdma-core",
- "redhat-release-eula",
"rng-tools",
"rpcbind",
"rpm-ostree",
diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/qcow2.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/qcow2.go
index 3dfe0a9..dcf1193 100644
--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/qcow2.go
+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/qcow2.go
@@ -98,7 +98,6 @@ func qcow2CommonPackageSet(t *rhel.ImageType) rpmmd.PackageSet {
"python3-jsonschema",
"qemu-guest-agent",
"redhat-release",
- "redhat-release-eula",
"rsync",
"tar",
"tuned",
@@ -138,6 +137,10 @@ func qcow2CommonPackageSet(t *rhel.ImageType) rpmmd.PackageSet {
"libertas-sd8787-firmware",
"nss",
"plymouth",
+ "rhn-check",
+ "rhn-setup",
+ "rhnsd",
+ "dnf-plugin-spacewalk",
"rng-tools",
"udisks2",
},
diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/ubi.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/ubi.go
index f787214..a6440eb 100644
--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/ubi.go
+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/ubi.go
@@ -87,7 +87,6 @@ func ubiCommonPackageSet(t *rhel.ImageType) rpmmd.PackageSet {
"glibc-langpack-en",
"openssl-pkcs11",
"python-unversioned-command",
- "redhat-release-eula",
"rpm-plugin-systemd-inhibit",
},
}
--
2.43.5