From: Jarod Wilson on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1735 NOTE: Truncated patchset since committer email 'prarit@redhat.com' does not match the submitter's GitLab public email address 'jarod@redhat.com'. For the non-Fedora (RHEL) case, we are looking to move to a setup where we include Merge Requests as soon as they are ready, and thus the head of main may not always be a tagged build. This gives some indication to someone basing a build on main that they're basing their work on the tree at a state between tagged builds.

If HEAD is a tagged build, as usual, you should see: linux-4.18.0-374.el8.tar.xz kernel-4.18.0-374.el8.src.rpm

If HEAD has additional commits, with this change, you should see: linux-4.18.0-374.g797f.el8.tar.xz kernel-4.18.0-374.g797f.el8.src.rpm

The .gSHA field is the 4-char HEAD sha of the branch after adding your local changes.

This is directly related to: https://gitlab.com/redhat/rhel/src/kernel/rhel-8/-/merge_requests/2405

Signed-off-by: Jarod Wilson jarod@redhat.com

--- redhat/configs/generate_all_configs.sh | 2 +- redhat/docs/makefile-changes.rst | 8 +- redhat/scripts/create-tarball.sh | 2 +- redhat/self-test/data/centos-2585cf9dfaad.el7 | 21 ++- redhat/self-test/data/centos-2585cf9dfaad.el7.spec | 24 ++-- redhat/self-test/data/centos-2585cf9dfaad.fc25 | 21 ++- redhat/self-test/data/centos-2585cf9dfaad.fc25.spec | 24 ++-- redhat/self-test/data/centos-78e36f3b0dae.el7 | 21 ++- redhat/self-test/data/centos-78e36f3b0dae.el7.spec | 24 ++-- redhat/self-test/data/centos-78e36f3b0dae.fc25 | 21 ++- redhat/self-test/data/centos-78e36f3b0dae.fc25.spec | 24 ++-- redhat/self-test/data/centos-df0cc57e057f.el7 | 21 ++- redhat/self-test/data/centos-df0cc57e057f.el7.spec | 24 ++-- redhat/self-test/data/centos-df0cc57e057f.fc25 | 21 ++- redhat/self-test/data/centos-df0cc57e057f.fc25.spec | 24 ++-- redhat/self-test/data/centos-fce15c45d3fb.el7 | 21 ++- redhat/self-test/data/centos-fce15c45d3fb.el7.spec | 24 ++-- redhat/self-test/data/centos-fce15c45d3fb.fc25 | 21 ++- redhat/self-test/data/centos-fce15c45d3fb.fc25.spec | 24 ++-- redhat/self-test/data/fedora-2585cf9dfaad.el7 | 21 ++- redhat/self-test/data/fedora-2585cf9dfaad.el7.spec | 24 ++-- redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 21 ++- redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec | 24 ++-- redhat/self-test/data/fedora-78e36f3b0dae.el7 | 21 ++- redhat/self-test/data/fedora-78e36f3b0dae.el7.spec | 24 ++-- redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 21 ++- redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec | 24 ++-- redhat/self-test/data/fedora-df0cc57e057f.el7 | 21 ++- redhat/self-test/data/fedora-df0cc57e057f.el7.spec | 24 ++-- redhat/self-test/data/fedora-df0cc57e057f.fc25 | 21 ++- redhat/self-test/data/fedora-df0cc57e057f.fc25.spec | 24 ++-- redhat/self-test/data/fedora-fce15c45d3fb.el7 | 21 ++- redhat/self-test/data/fedora-fce15c45d3fb.el7.spec | 24 ++-- redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 21 ++- redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec | 24 ++-- redhat/self-test/data/rhel-2585cf9dfaad.el7 | 21 ++- redhat/self-test/data/rhel-2585cf9dfaad.el7.spec | 24 ++-- redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 21 ++- redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec | 24 ++-- redhat/self-test/data/rhel-78e36f3b0dae.el7 | 21 ++- redhat/self-test/data/rhel-78e36f3b0dae.el7.spec | 24 ++-- redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 21 ++- redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec | 24 ++-- redhat/self-test/data/rhel-df0cc57e057f.el7 | 21 ++- redhat/self-test/data/rhel-df0cc57e057f.el7.spec | 24 ++-- redhat/self-test/data/rhel-df0cc57e057f.fc25 | 21 ++- redhat/self-test/data/rhel-df0cc57e057f.fc25.spec | 24 ++-- redhat/self-test/data/rhel-fce15c45d3fb.el7 | 21 ++- redhat/self-test/data/rhel-fce15c45d3fb.el7.spec | 24 ++-- redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 21 ++- redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec | 24 ++-- redhat/self-test/1006-verify-SPEC-variables.bats | 24 ++++ redhat/Makefile | 111 ++++++++++++------- redhat/Makefile.variables | 2 +- redhat/genspec.sh | 55 +++++---- redhat/kernel.spec.template | 56 +++++----- 56 files changed, 734 insertions(+), 606 deletions(-)