kernel April 2022

kernel@lists.fedoraproject.org

11 participants
65 discussions

[OS-BUILD PATCHv4 0/0] redhat: indicate HEAD state in tarball/rpm name
by Jarod Wilson (via Email Bridge) 28 Apr '22

28 Apr '22

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 | 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(-)

1 1

[OS-BUILD PATCHv3 0/0] redhat: indicate HEAD state in tarball/rpm name
by Jarod Wilson (via Email Bridge) 28 Apr '22

28 Apr '22

1 0

[OS-BUILD PATCH 0/5] Forward port centos changes for early zstream release numbering
by Herton R. Krzesinski (via Email Bridge) 28 Apr '22

28 Apr '22

From: Herton R. Krzesinski on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1764 This patch series forward port the changes done in rhel9/centos as merged in https://gitlab.com/redhat/centos-stream/src/kernel/centos- stream-9/-/merge_requests/600 (only those related to switch/use zstream numbers in package build). This is used only in centos/rhel when we fork from centos to a given rhel release, and need to use zstream numbering, so it doesn't conflict with ystream release numbers. Signed-off-by: Herton R. Krzesinski <herton(a)redhat.com> --- redhat/scripts/create_distgit_changelog.sh | 59 ------------------------------ redhat/scripts/rh-dist-git.sh | 22 +++------- redhat/Makefile | 11 ++--- redhat/genlog.py | 44 +++++++++++++++++----- redhat/genspec.sh | 54 +++++++++++++++------------ redhat/kernel.spec.template | 6 +-- Makefile.rhelver | 22 +++++++++++ 7 files changed, 100 insertions(+), 118 deletions(-)

2 6

[OS-BUILD PATCH] Move CONFIG_HW_RANDOM_CN10K to a proper place
by Vladis Dronov (via Email Bridge) 25 Apr '22

25 Apr '22

From: Vladis Dronov <vdronov(a)redhat.com> Move CONFIG_HW_RANDOM_CN10K to a proper place And make it build as a module. Signed-off-by: Vladis Dronov <vdronov(a)redhat.com> diff --git a/redhat/configs/common/generic/CONFIG_HW_RANDOM_CN10K b/redhat/configs/common/generic/CONFIG_HW_RANDOM_CN10K deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/common/generic/CONFIG_HW_RANDOM_CN10K +++ /dev/null @@ -1 +0,0 @@ -CONFIG_HW_RANDOM_CN10K=y diff --git a/redhat/configs/common/generic/arm/aarch64/CONFIG_HW_RANDOM_CN10K b/redhat/configs/common/generic/arm/aarch64/CONFIG_HW_RANDOM_CN10K new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_HW_RANDOM_CN10K @@ -0,0 +1 @@ +CONFIG_HW_RANDOM_CN10K=m diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_HW_RANDOM_CN10K b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_HW_RANDOM_CN10K deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_HW_RANDOM_CN10K +++ /dev/null @@ -1 +0,0 @@ -CONFIG_HW_RANDOM_CN10K=y -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1760

1 1

[OS-BUILD PATCH 0/18] redhat: test updates
by Prarit Bhargava (via Email Bridge) 22 Apr '22

22 Apr '22

From: Prarit Bhargava on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1728 Depends: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1727 Add a test to verify Makefile declarations, and add the RHTEST variable. The latter of these changes allows users to execute make commands with -n, --dry-run, and other "test" commands. Signed-off-by: Prarit Bhargava <prarit(a)redhat.com> --- redhat/configs/build_configs.sh | 2 + redhat/configs/generate_all_configs.sh | 4 +- redhat/configs/process_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/self-test/3001-Makefile-contents.bats | 17 +++ redhat/Makefile | 108 +++++++++++-------- redhat/Makefile.variables | 2 +- redhat/genspec.sh | 55 +++++---- redhat/kernel.spec.template | 56 +++++----- 59 files changed, 754 insertions(+), 606 deletions(-)

2 19

[OS-BUILD PATCH 0/16] redhat: Use SPEC variable naming
by Prarit Bhargava (via Email Bridge) 22 Apr '22

22 Apr '22

From: Prarit Bhargava on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1727 Depends: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1647 One of the common complaints about the redhat Makefiles, genspec.sh, and kernel.spec.template is that it is not possible to determine which variables are being used in the Makefiles and which are being used in the kernel.spec.template. This changeset introduces a convention of prefixing all variables used in the kernel.spec.template with SPEC so that knowledgeable readers can track variable use and see how variable changes affect the kernel spec file. Signed-off-by: Prarit Bhargava <prarit(a)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 | 102 +++++++++++-------- redhat/Makefile.variables | 2 +- redhat/genspec.sh | 55 +++++----- redhat/kernel.spec.template | 56 +++++----- 56 files changed, 725 insertions(+), 606 deletions(-)

1 16

[OS-BUILD PATCH] redhat/configs: aarch64: enable CPU_FREQ_GOV_SCHEDUTIL
by Mark Salter (via Email Bridge) 22 Apr '22

22 Apr '22

From: Mark Salter <msalter(a)redhat.com> redhat/configs: aarch64: enable CPU_FREQ_GOV_SCHEDUTIL RHEL8 has CPU_FREQ_GOV_SCHEDUTIL=y as default and individual arches needed to disable it if desired. Ark/Centos-Stream/RHEL9 has the default =n and individual arches must enable. Aarch64 was missed in this transition, so let's enable it now. Signed-off-by: Mark Salter <msalter(a)redhat.com> diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_CPU_FREQ_GOV_SCHEDUTIL b/redhat/configs/ark/generic/arm/aarch64/CONFIG_CPU_FREQ_GOV_SCHEDUTIL new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/ark/generic/arm/aarch64/CONFIG_CPU_FREQ_GOV_SCHEDUTIL @@ -0,0 +1 @@ +CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1762

1 0

gcc: error: unrecognized command-line option '-mharden-sls=all'
by Sérgio Basto 21 Apr '22

21 Apr '22

Hi, to test Virtualbox host kmods on new kernel (x86_64 only), I install fedora-rawhide-kernel-nodebug [1] but last two update I see with ack SLS [2] but SLS is strict arm thing , this is a bug ? or I'm missing something ? Thank you [2] .config 347:CONFIG_CC_HAS_SLS=y 348:CONFIG_SLS=y [1] dnf --disablerepo='*' --enablerepo=fedora-rawhide-kernel-nodebug update -- Sérgio M. B.

3 4

[OS-BUILD PATCHv8 0/11] redhat: Use Makefile variables in scripts
by Prarit Bhargava (via Email Bridge) 21 Apr '22

21 Apr '22

From: Prarit Bhargava on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1647 Use Makefile variables in scripts that are called from the Makefile. Signed-off-by: Prarit Bhargava <prarit(a)redhat.com> --- redhat/configs/build_configs.sh | 18 ++--- redhat/configs/generate_all_configs.sh | 20 ++---- redhat/configs/process_configs.sh | 11 +-- redhat/scripts/create-tarball.sh | 8 +- redhat/scripts/rh-dist-git.sh | 62 ++++++-------------- redhat/self-test/data/centos-2585cf9dfaad.el7 | 4 +- redhat/self-test/data/centos-2585cf9dfaad.el7.spec | 47 ++++++++------- redhat/self-test/data/centos-2585cf9dfaad.fc25 | 4 +- redhat/self-test/data/centos-2585cf9dfaad.fc25.spec | 47 ++++++++------- redhat/self-test/data/centos-78e36f3b0dae.el7 | 4 +- redhat/self-test/data/centos-78e36f3b0dae.el7.spec | 47 ++++++++------- redhat/self-test/data/centos-78e36f3b0dae.fc25 | 4 +- redhat/self-test/data/centos-78e36f3b0dae.fc25.spec | 47 ++++++++------- redhat/self-test/data/centos-df0cc57e057f.el7 | 4 +- redhat/self-test/data/centos-df0cc57e057f.el7.spec | 47 ++++++++------- redhat/self-test/data/centos-df0cc57e057f.fc25 | 4 +- redhat/self-test/data/centos-df0cc57e057f.fc25.spec | 47 ++++++++------- redhat/self-test/data/centos-fce15c45d3fb.el7 | 4 +- redhat/self-test/data/centos-fce15c45d3fb.el7.spec | 47 ++++++++------- redhat/self-test/data/centos-fce15c45d3fb.fc25 | 4 +- redhat/self-test/data/centos-fce15c45d3fb.fc25.spec | 47 ++++++++------- redhat/self-test/data/create-data.sh | 4 +- redhat/self-test/data/fedora-2585cf9dfaad.el7 | 6 +- redhat/self-test/data/fedora-2585cf9dfaad.el7.spec | 47 ++++++++------- redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 6 +- redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec | 47 ++++++++------- redhat/self-test/data/fedora-78e36f3b0dae.el7 | 6 +- redhat/self-test/data/fedora-78e36f3b0dae.el7.spec | 47 ++++++++------- redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 6 +- redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec | 47 ++++++++------- redhat/self-test/data/fedora-df0cc57e057f.el7 | 6 +- redhat/self-test/data/fedora-df0cc57e057f.el7.spec | 47 ++++++++------- redhat/self-test/data/fedora-df0cc57e057f.fc25 | 6 +- redhat/self-test/data/fedora-df0cc57e057f.fc25.spec | 47 ++++++++------- redhat/self-test/data/fedora-fce15c45d3fb.el7 | 6 +- redhat/self-test/data/fedora-fce15c45d3fb.el7.spec | 47 ++++++++------- redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 6 +- redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec | 47 ++++++++------- redhat/self-test/data/rhel-2585cf9dfaad.el7 | 6 +- redhat/self-test/data/rhel-2585cf9dfaad.el7.spec | 47 ++++++++------- redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 6 +- redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec | 47 ++++++++------- redhat/self-test/data/rhel-78e36f3b0dae.el7 | 6 +- redhat/self-test/data/rhel-78e36f3b0dae.el7.spec | 47 ++++++++------- redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 6 +- redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec | 47 ++++++++------- redhat/self-test/data/rhel-df0cc57e057f.el7 | 6 +- redhat/self-test/data/rhel-df0cc57e057f.el7.spec | 47 ++++++++------- redhat/self-test/data/rhel-df0cc57e057f.fc25 | 6 +- redhat/self-test/data/rhel-df0cc57e057f.fc25.spec | 47 ++++++++------- redhat/self-test/data/rhel-fce15c45d3fb.el7 | 6 +- redhat/self-test/data/rhel-fce15c45d3fb.el7.spec | 47 ++++++++------- redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 6 +- redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec | 47 ++++++++------- redhat/Makefile | 53 +++++++++-------- redhat/Makefile.rhpkg | 4 +- redhat/Makefile.variables | 5 + redhat/genspec.sh | 6 +- redhat/kernel.spec.template | 7 +- 59 files changed, 774 insertions(+), 680 deletions(-)

1 11

[OS-BUILD PATCHv2] redhat: indicate HEAD state in tarball/rpm name
by Jarod Wilson (via Email Bridge) 21 Apr '22

21 Apr '22

From: Jarod Wilson <jarod(a)redhat.com> redhat: indicate HEAD state in tarball/rpm name 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 first four chars of the 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> diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -49,6 +49,7 @@ FLAVOR= CURARCH := $(shell uname -m) ARCHCONFIG := $(shell uname -m | sed -e s/x86_64/X86_64/ \ -e s/s390x/S390/ -e s/ppc.*/PPC/ ) +RHEL_EXTRAVERSION= # rpm information SPECFILE:=$(PACKAGE_NAME).spec @@ -189,6 +190,13 @@ ifeq ($(VERSION_ON_UPSTREAM),1) endif else SNAPSHOT:=0 + EXACT_TAG:=$(shell $(GIT) describe --exact-match 2>/dev/null) + ifeq ($(EXACT_TAG),) + _TAG:=$(shell $(GIT) describe 2>/dev/null) + ifneq ($(_TAG),) + RHEL_EXTRAVERSION:=$(shell echo $(_TAG) | awk -F- '{ printf(".%s", $$(NF)) }' | cut -c 1-6) + endif + endif endif KVERSION:=$(RPMKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL) @@ -231,6 +239,7 @@ else # upstream sources and RHEL specific patches. SINGLE_TARBALL:=1 RHDISTGIT_BRANCH:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0 + BUILD:=$(BUILD)$(RHEL_EXTRAVERSION) ifndef BUILD_SCRATCH_TARGET BUILD_SCRATCH_TARGET:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0-test-pesign endif -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1735

4 6

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

kernel April 2022