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(a)redhat.com'
does not match the submitter's GitLab public email address
'jarod(a)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(a)redhat.com>
---
redhat/configs/generate_all_configs.sh | 2 +-
redhat/docs/makefile-changes.rst | 8 +-
redhat/scripts/create-tarball.sh | 5 +-
redhat/scripts/rh-dist-git.sh | 4 +-
redhat/self-test/data/centos-2585cf9dfaad.el7 | 26 ++--
redhat/self-test/data/centos-2585cf9dfaad.el7.spec | 26 ++--
redhat/self-test/data/centos-2585cf9dfaad.fc25 | 26 ++--
redhat/self-test/data/centos-2585cf9dfaad.fc25.spec | 26 ++--
redhat/self-test/data/centos-78e36f3b0dae.el7 | 24 ++--
redhat/self-test/data/centos-78e36f3b0dae.el7.spec | 26 ++--
redhat/self-test/data/centos-78e36f3b0dae.fc25 | 24 ++--
redhat/self-test/data/centos-78e36f3b0dae.fc25.spec | 26 ++--
redhat/self-test/data/centos-df0cc57e057f.el7 | 26 ++--
redhat/self-test/data/centos-df0cc57e057f.el7.spec | 26 ++--
redhat/self-test/data/centos-df0cc57e057f.fc25 | 26 ++--
redhat/self-test/data/centos-df0cc57e057f.fc25.spec | 26 ++--
redhat/self-test/data/centos-fce15c45d3fb.el7 | 24 ++--
redhat/self-test/data/centos-fce15c45d3fb.el7.spec | 26 ++--
redhat/self-test/data/centos-fce15c45d3fb.fc25 | 24 ++--
redhat/self-test/data/centos-fce15c45d3fb.fc25.spec | 26 ++--
redhat/self-test/data/fedora-2585cf9dfaad.el7 | 26 ++--
redhat/self-test/data/fedora-2585cf9dfaad.el7.spec | 26 ++--
redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 26 ++--
redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec | 26 ++--
redhat/self-test/data/fedora-78e36f3b0dae.el7 | 24 ++--
redhat/self-test/data/fedora-78e36f3b0dae.el7.spec | 26 ++--
redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 24 ++--
redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec | 26 ++--
redhat/self-test/data/fedora-df0cc57e057f.el7 | 26 ++--
redhat/self-test/data/fedora-df0cc57e057f.el7.spec | 26 ++--
redhat/self-test/data/fedora-df0cc57e057f.fc25 | 26 ++--
redhat/self-test/data/fedora-df0cc57e057f.fc25.spec | 26 ++--
redhat/self-test/data/fedora-fce15c45d3fb.el7 | 24 ++--
redhat/self-test/data/fedora-fce15c45d3fb.el7.spec | 26 ++--
redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 24 ++--
redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec | 26 ++--
redhat/self-test/data/rhel-2585cf9dfaad.el7 | 26 ++--
redhat/self-test/data/rhel-2585cf9dfaad.el7.spec | 26 ++--
redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 26 ++--
redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec | 26 ++--
redhat/self-test/data/rhel-78e36f3b0dae.el7 | 24 ++--
redhat/self-test/data/rhel-78e36f3b0dae.el7.spec | 26 ++--
redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 24 ++--
redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec | 26 ++--
redhat/self-test/data/rhel-df0cc57e057f.el7 | 26 ++--
redhat/self-test/data/rhel-df0cc57e057f.el7.spec | 26 ++--
redhat/self-test/data/rhel-df0cc57e057f.fc25 | 26 ++--
redhat/self-test/data/rhel-df0cc57e057f.fc25.spec | 26 ++--
redhat/self-test/data/rhel-fce15c45d3fb.el7 | 24 ++--
redhat/self-test/data/rhel-fce15c45d3fb.el7.spec | 26 ++--
redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 24 ++--
redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec | 26 ++--
redhat/self-test/1006-verify-SPEC-variables.bats | 25 ++++
redhat/Makefile | 107 ++++++++++++-------
redhat/Makefile.variables | 2 +-
redhat/genspec.sh | 70 ++++++------
redhat/kernel.spec.template | 54 +++++-----
redhat/update_scripts.sh | 2 +-
58 files changed, 781 insertions(+), 722 deletions(-)