From b48b0f06645f6c68d58a0daffc15b07efddd8f9c Mon Sep 17 00:00:00 2001 From: Josue David Hernandez Gutierrez Date: Thu, 31 Oct 2024 03:46:51 +0000 Subject: [PATCH 4/9] Fix packageSets Signed-off-by: Josue David Hernandez Gutierrez --- .../osbuild/images/pkg/distro/rhel/rhel10/ami.go | 1 - .../osbuild/images/pkg/distro/rhel/rhel10/bare_metal.go | 7 ++----- .../osbuild/images/pkg/distro/rhel/rhel10/qcow2.go | 5 ++++- .../osbuild/images/pkg/distro/rhel/rhel10/ubi.go | 1 - .../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 - 12 files changed, 12 insertions(+), 24 deletions(-) diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/ami.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/ami.go index 7042251..c397edd 100644 --- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/ami.go +++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/ami.go @@ -306,7 +306,6 @@ func ec2PackageSet(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/rhel10/bare_metal.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/bare_metal.go index dd39e1b..942784f 100644 --- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/bare_metal.go +++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/bare_metal.go @@ -98,15 +98,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)) // Ensure to not pull in subscription-manager on non-RHEL distro @@ -127,6 +124,7 @@ func installerPackageSet(t *rhel.ImageType) rpmmd.PackageSet { "anaconda-dracut", "curl", "dracut-config-generic", + "dracut-config-rescue", "dracut-network", "hostname", "iwl100-firmware", @@ -274,7 +272,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/rhel10/qcow2.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/qcow2.go index fbb58be..4c3c4b6 100644 --- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/qcow2.go +++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/qcow2.go @@ -73,7 +73,6 @@ func qcow2CommonPackageSet(t *rhel.ImageType) rpmmd.PackageSet { "python3-jsonschema", "qemu-guest-agent", "redhat-release", - "redhat-release-eula", "rsync", "tar", "tuned", @@ -112,6 +111,10 @@ func qcow2CommonPackageSet(t *rhel.ImageType) rpmmd.PackageSet { "langpacks-en", "libertas-sd8787-firmware", "plymouth", + "rhn-check", + "rhn-setup", + "rhnsd", + "dnf-plugin-spacewalk", "rng-tools", "udisks2", }, diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/ubi.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/ubi.go index 603fd75..d59d9e5 100644 --- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/ubi.go +++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/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", }, } 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 a29f9ee..2b463e0 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 @@ -344,7 +344,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 ac371d8..ca6907c 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 b1009b1..fc40edd 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 @@ -101,7 +101,6 @@ func qcow2CommonPackageSet(t *rhel.ImageType) rpmmd.PackageSet { "python3-jsonschema", "qemu-guest-agent", "redhat-release", - "redhat-release-eula", "rsync", "tar", "tcpdump", @@ -113,7 +112,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 1604be8..a7689cf 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 @@ -178,7 +178,6 @@ func ec2BasePackageSet(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 f98f4c5..e284063 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 5875caf..20a8022 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 @@ -99,7 +99,6 @@ func qcow2CommonPackageSet(t *rhel.ImageType) rpmmd.PackageSet { "python3-jsonschema", "qemu-guest-agent", "redhat-release", - "redhat-release-eula", "rsync", "tar", "tuned", @@ -139,6 +138,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.47.1