diff --git a/common.yaml b/common.yaml index 29e8b915..b544953c 100644 --- a/common.yaml +++ b/common.yaml @@ -298,9 +298,8 @@ packages-aarch64: - irqbalance packages-s390x: - # Required for IBM Secure Execution - # Pinned due to https://github.com/openshift/os/issues/1731 - - s390utils-base-2.33.1-2.el9 + # Required genprotimg for IBM Secure Execution + - s390utils-base remove-from-packages: - - filesystem diff --git a/manifest-rhel-9.6.yaml b/manifest-rhel-9.6.yaml index 59b4dda6..21cc71da 100644 --- a/manifest-rhel-9.6.yaml +++ b/manifest-rhel-9.6.yaml @@ -12,6 +12,7 @@ variables: # Include manifests common to all RHEL and CentOS Stream versions include: - common.yaml + - overrides-rhel-9.6.yaml repos: - rhel-9.6-baseos diff --git a/overrides-rhel-9.6.yaml b/overrides-rhel-9.6.yaml new file mode 100644 index 00000000..6849a684 --- /dev/null +++ b/overrides-rhel-9.6.yaml @@ -0,0 +1,9 @@ +# This is a poor man's version of an override lockfile for rhel-9.6. When needed +# we gather any overrides NEVRs here to keep them in one place. When not needed, +# empty or comment out this file (except this comment). + +#packages: + +packages-s390x: + # https://github.com/openshift/os/issues/1731 + - s390utils-base-2.33.1-2.el9