From: Prarit Bhargava on
gitlab.com
Merge Request:
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2021
centos-stream-9 !1308 [1] updates the redhat/ directory in centos-stream-9
to match that of ARK. After that update there are about 40 changes that
are not applied to ARK but have been applied to "downstream"
centos-stream-9. Some of these changes are centos-stream-9/RHEL9 specific
changes that should not be applied to ARK, and this MR applies the
remaining set to ARK.
Update with RHEL-only changes.
[1]
https://gitlab.com/redhat/centos-stream/src/kernel/centos-
stream-9/-/merge_requests/1308
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
---
redhat/kabi/check-kabi | 39 +-
redhat/kabi/diff-kabi | 42 +
redhat/kabi/show-kabi | 31 +-
redhat/kabi/symtype-generate | 678 ++++++++++++++++++++
redhat/kabi/symtypes | 238 +++++++
redhat/kabi/update-kabi | 125 +++
redhat/rhel_files/filter-i686.sh.rhel | 0
redhat/scripts/clone_tree.sh | 32 -
redhat/scripts/merge-subtrees.sh | 2 +-
redhat/scripts/rh-dist-git.sh | 10 +-
redhat/self-test/data/centos-2585cf9dfaad.el7 | 10 +-
redhat/self-test/data/centos-2585cf9dfaad.el7.spec | 3 +-
redhat/self-test/data/centos-2585cf9dfaad.fc25 | 10 +-
redhat/self-test/data/centos-2585cf9dfaad.fc25.spec | 3 +-
redhat/self-test/data/centos-78e36f3b0dae.el7 | 10 +-
redhat/self-test/data/centos-78e36f3b0dae.el7.spec | 3 +-
redhat/self-test/data/centos-78e36f3b0dae.fc25 | 10 +-
redhat/self-test/data/centos-78e36f3b0dae.fc25.spec | 3 +-
redhat/self-test/data/centos-df0cc57e057f.el7 | 10 +-
redhat/self-test/data/centos-df0cc57e057f.el7.spec | 3 +-
redhat/self-test/data/centos-df0cc57e057f.fc25 | 10 +-
redhat/self-test/data/centos-df0cc57e057f.fc25.spec | 3 +-
redhat/self-test/data/centos-fce15c45d3fb.el7 | 10 +-
redhat/self-test/data/centos-fce15c45d3fb.el7.spec | 3 +-
redhat/self-test/data/centos-fce15c45d3fb.fc25 | 10 +-
redhat/self-test/data/centos-fce15c45d3fb.fc25.spec | 3 +-
redhat/self-test/data/fedora-2585cf9dfaad.el7 | 7 +-
redhat/self-test/data/fedora-2585cf9dfaad.el7.spec | 1 +
redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 7 +-
redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec | 1 +
redhat/self-test/data/fedora-78e36f3b0dae.el7 | 7 +-
redhat/self-test/data/fedora-78e36f3b0dae.el7.spec | 1 +
redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 7 +-
redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec | 1 +
redhat/self-test/data/fedora-df0cc57e057f.el7 | 7 +-
redhat/self-test/data/fedora-df0cc57e057f.el7.spec | 1 +
redhat/self-test/data/fedora-df0cc57e057f.fc25 | 7 +-
redhat/self-test/data/fedora-df0cc57e057f.fc25.spec | 1 +
redhat/self-test/data/fedora-fce15c45d3fb.el7 | 7 +-
redhat/self-test/data/fedora-fce15c45d3fb.el7.spec | 1 +
redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 7 +-
redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec | 1 +
redhat/self-test/data/rhel-2585cf9dfaad.el7 | 9 +-
redhat/self-test/data/rhel-2585cf9dfaad.el7.spec | 3 +-
redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 9 +-
redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec | 3 +-
redhat/self-test/data/rhel-78e36f3b0dae.el7 | 9 +-
redhat/self-test/data/rhel-78e36f3b0dae.el7.spec | 3 +-
redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 9 +-
redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec | 3 +-
redhat/self-test/data/rhel-df0cc57e057f.el7 | 9 +-
redhat/self-test/data/rhel-df0cc57e057f.el7.spec | 3 +-
redhat/self-test/data/rhel-df0cc57e057f.fc25 | 9 +-
redhat/self-test/data/rhel-df0cc57e057f.fc25.spec | 3 +-
redhat/self-test/data/rhel-fce15c45d3fb.el7 | 9 +-
redhat/self-test/data/rhel-fce15c45d3fb.el7.spec | 3 +-
redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 9 +-
redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec | 3 +-
redhat/Makefile | 107 ++-
redhat/Makefile.rhpkg | 13 -
redhat/Makefile.variables | 17 +
redhat/genspec.sh | 3 +-
redhat/kernel.spec.template | 38 +-
63 files changed, 1493 insertions(+), 146 deletions(-)