Skip to content

redhat: Update directory with ARK changes

Prarit Bhargava requested to merge prarit/centos-stream-9:update_redhat_latest into main

Bugzilla: INTERNAL

This changeset is an update of the redhat/ directory.
The big reason behind this is the eventual inclusion of the -rt and -auto
configs. We want these to be in-sync with ARK. ie) reduce the amount of
work the Fedora/ARK, Auto, and RT teams have to do to review the configs.

This update was performed by executing the following command in the ARK os-build branch:

git log --oneline --no-merges redhat ':(exclude)redhat/configs/common' ':(exclude)redhat/configs/ark' ':(exclude)redhat/configs/pending-common' ':(exclude)redhat/kabi/kabi-module' ':(exclude)redhat/configs/pending-ark' ':(exclude)redhat/configs/fedora' ':(exclude)redhat/configs/pending-fedora' ':(exclude)redhat/rhdocs/' | grep -v "[redhat] kernel-" > /tmp/ark.list.orig

and comparing the output of this command in the centos-stream-9 main branch:

git log --oneline --no-merges redhat ':(exclude)redhat/configs/common' ':(exclude)redhat/configs/ark' ':(exclude)redhat/configs/pending-common' ':(exclude)redhat/kabi/kabi-module' ':(exclude)redhat/kernel.changelog-9.1' ':(exclude)redhat/configs/pending-ark' ':(exclude)redhat/configs/fedora' ':(exclude)redhat/configs/pending-fedora' ':(exclude)redhat/rhdocs/' | grep -v "[redhat] kernel-" > /tmp/rhel.list.orig

After comparing these lists it was possible to find a divergent commit and then evaluate "ARK-specific" changes to "CS9-specific" changes.

The first step in applying the "ARK-specific" changes to centos-stream-9 was to revert all the "CS9-
changes" and apply the "ARK-specific" changes. After this, the "CS9-changes" were re-applied while examining each commit to determine if the change was still applicable to centos-stream-9 + the "ARK-
specific" changes.

This results in ~40 commits that are different between ARK and centos-stream-9. Many of these commits can be forward-ported to ARK and will be done so in future commits to ARK.

Note: I am only reverting and reapplying the kernel.spec.template change in ecfde07f ("crypto: fips - make proc files report fips module name and version") to avoid issues with the CKI BZ bot.

Update the redhat/ directory.

Signed-off-by: Prarit Bhargava prarit@redhat.com

Edited by Prarit Bhargava

Merge request reports