kernel June 2022

kernel@lists.fedoraproject.org

8 participants
77 discussions

[OS-BUILD PATCH] Change CRYPTO_CHACHA_S390 from m to y
by Justin M. Forbes (via Email Bridge) 03 Jun '22

03 Jun '22

From: Justin M. Forbes <jforbes(a)fedoraproject.org> Change CRYPTO_CHACHA_S390 from m to y Upstream commit 349d03ffd5f6 changed CRYPTO_CHACHA_S390 to select CRYPTO_LIB_CHACHA_GENERIC which we already have as built-in. To avoid mismatches, we need to move CRYPTO_CHACHA_S390 from module to built-in. Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org> diff --git a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_CHACHA_S390 b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_CHACHA_S390 deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_CHACHA_S390 +++ /dev/null @@ -1 +0,0 @@ -CONFIG_CRYPTO_CHACHA_S390=y diff --git a/redhat/configs/common/generic/s390x/CONFIG_CRYPTO_CHACHA_S390 b/redhat/configs/common/generic/s390x/CONFIG_CRYPTO_CHACHA_S390 index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/s390x/CONFIG_CRYPTO_CHACHA_S390 +++ b/redhat/configs/common/generic/s390x/CONFIG_CRYPTO_CHACHA_S390 @@ -1 +1 @@ -CONFIG_CRYPTO_CHACHA_S390=m +CONFIG_CRYPTO_CHACHA_S390=y diff --git a/redhat/configs/fedora/generic/s390x/CONFIG_CRYPTO_CHACHA_S390 b/redhat/configs/fedora/generic/s390x/CONFIG_CRYPTO_CHACHA_S390 deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/fedora/generic/s390x/CONFIG_CRYPTO_CHACHA_S390 +++ /dev/null @@ -1 +0,0 @@ -CONFIG_CRYPTO_CHACHA_S390=y diff --git a/redhat/configs/pending-ark/generic/s390x/CONFIG_CRYPTO_CHACHA_S390 b/redhat/configs/pending-ark/generic/s390x/CONFIG_CRYPTO_CHACHA_S390 deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/pending-ark/generic/s390x/CONFIG_CRYPTO_CHACHA_S390 +++ /dev/null @@ -1 +0,0 @@ -CONFIG_CRYPTO_CHACHA_S390=y -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1834

2 9

Kernel 5.18 Test Week 2022-06-05 through 2022-06-11
by Sumantro Mukherjee 03 Jun '22

03 Jun '22

Hey All, I would like to invite all of you to participate in the Kernel 5.18 Test week is happening from 2022-06-05 to 2022-06-11. It's fairly simple, head over to the wiki [0] and read in detail about the test week and simply run the test case mentioned in[1] and enter your results. As usual, the Fedora QA team will hangout at #fedora-test-day(a)libera.chat for question and discussion. BTW, we have the fedora community survey happening[2] and the election happening too[3] Needless to say, you will get a badge for participating in all activities talked about in this email! [0] http://fedoraproject.org/wiki/Test_Day:2022-06-05_Kernel_5.18_Test_Week [1] https://testdays.fedoraproject.org/events/136 [2] https://discussion.fedoraproject.org/t/2022-fedora-community-survey/39569 [3] https://elections.fedoraproject.org/ -- //sumantro Fedora QE TRIED AND PERSONALLY TESTED, ERGO TRUSTED

2 1

[OS-BUILD PATCH] redhat/Makefile: Add SPECKABIVERSION variable
by Prarit Bhargava (via Email Bridge) 02 Jun '22

02 Jun '22

From: Prarit Bhargava <prarit(a)redhat.com> redhat/Makefile: Add SPECKABIVERSION variable Empty kabi tarballs are uploaded to dist-git everytime an .eln build is completed. These empty kabi tarballs waste disk space. In addition to this, new users that recompile the kernel often attempt to update the specversion or other strings in order to generate a new NVR. These types of builds fail because the kabi tarballs will not be found. For DISTRO="fedora" builds, the kabi tarball names only need to be tagged with SPECVERSION since the file does not change. By removing the SPECBUILD string (relative to the existing BASEVERSION string), this results in the empty tarballs being uploaded only once into dist-git and also resolves the kernel recompile issue for .eln builds. Add a SPECKABIVERSION variable that sets the kabi tarballs to SPECVERSION for fedora builds, and BASEVERSION for rhel and centos. Signed-off-by: Prarit Bhargava <prarit(a)redhat.com> diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -251,11 +251,6 @@ BASEVERSION:=$(SPECVERSION)-$(SPECBUILD) RELEASETAG:=$(PACKAGE_NAME)-$(BASEVERSION) SRPM:=$(SRPMS)/$(RELEASETAG)$(DIST).src.rpm -# kabi variables -KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(BASEVERSION).tar.bz2 -KABIDW := $(REDHAT)/kabi-dwarf -KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(BASEVERSION).tar.bz2 - # # This conditional statement is where fedora, centos, and other (aka RHEL) # specific values should be set. @@ -270,6 +265,7 @@ ifeq ("$(DISTRO)", "fedora") # replace the tarball from one with upstream, rebuild, and then deploy # without changing anything else in the specfile. SPECTARFILE_RELEASE:=$(UPSTREAM_TARBALL_NAME) + SPECKABIVERSION:=$(BASEVERSION) else ifeq ("$(DISTRO)", "centos") SINGLE_TARBALL:=1 RHDISTGIT_BRANCH:=c$(RHEL_MAJOR)s @@ -280,6 +276,7 @@ else ifeq ("$(DISTRO)", "centos") BUILD_SCRATCH_TARGET:=c$(RHEL_MAJOR)s-candidate endif SPECTARFILE_RELEASE:=$(BASEVERSION) + SPECKABIVERSION:=$(SPECVERSION) else SINGLE_TARBALL:=1 RHDISTGIT_BRANCH:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0 @@ -287,6 +284,7 @@ else BUILD_SCRATCH_TARGET:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0-test-pesign endif SPECTARFILE_RELEASE:=$(BASEVERSION) + SPECKABIVERSION:=$(SPECVERSION) endif ifndef BUILD_TARGET @@ -296,6 +294,10 @@ endif TARFILE:=linux-$(SPECTARFILE_RELEASE).tar.xz TARBALL:=$(REDHAT)/$(TARFILE) +KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(SPECKABIVERSION).tar.bz2 +KABIDW := $(REDHAT)/kabi-dwarf +KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(SPECKABIVERSION).tar.bz2 + include Makefile.rhpkg ifeq ("$(ZSTREAM)", "yes") diff --git a/redhat/genspec.sh b/redhat/genspec.sh index blahblah..blahblah 100755 --- a/redhat/genspec.sh +++ b/redhat/genspec.sh @@ -74,6 +74,7 @@ test -f "$SOURCES/$SPECFILE" && s/%%SPECINCLUDE_RHEL_FILES%%/$SPECINCLUDE_RHEL_FILES/ s/%%SPECPATCHLIST_CHANGELOG%%/$SPECPATCHLIST_CHANGELOG/ s/%%SPECVERSION%%/$SPECVERSION/ + s/%%SPECKABIVERSION%%/$SPECKABIVERSION/ s/%%SPECTARFILE_RELEASE%%/$SPECTARFILE_RELEASE/" "$SOURCES/$SPECFILE" test -n "$RHSELFTESTDATA" && test -f "$SOURCES/$SPECFILE" && sed -i -e " /%%SPECCHANGELOG%%/r $SOURCES/$SPECCHANGELOG diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index blahblah..blahblah 100755 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -129,8 +129,10 @@ Summary: The Linux kernel %define tarfile_release %%SPECTARFILE_RELEASE%% # This is needed to do merge window version magic %define patchlevel %%SPECKPATCHLEVEL%% -# allow pkg_release to have configurable %%{?dist} tag +# This allows pkg_release to have configurable %%{?dist} tag %define specrelease %%SPECRELEASE%% +# This defines the kabi tarball version +%define kabiversion %%SPECKABIVERSION%% # # End of genspec.sh variables @@ -829,8 +831,8 @@ Source211: Module.kabi_dup_ppc64le Source212: Module.kabi_dup_s390x Source213: Module.kabi_dup_x86_64 -Source300: kernel-abi-stablelists-%{specversion}-%{pkgrelease}.tar.bz2 -Source301: kernel-kabi-dw-%{specversion}-%{pkgrelease}.tar.bz2 +Source300: kernel-abi-stablelists-%{kabiversion}.tar.bz2 +Source301: kernel-kabi-dw-%{kabiversion}.tar.bz2 # Sources for kernel-tools Source2000: cpupower.service diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7 b/redhat/self-test/data/centos-2585cf9dfaad.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.el7 +++ b/redhat/self-test/data/centos-2585cf9dfaad.el7 @@ -23,8 +23,8 @@ HEAD=2585cf9dfaad INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.tar.bz2 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0.tar.bz2 LANG=C LOCVERFILE=../localversion MACH=x86_64 @@ -55,6 +55,7 @@ SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec SPECINCLUDE_FEDORA_FILES=1 SPECINCLUDE_RHEL_FILES=1 +SPECKABIVERSION=5.16.0 SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec index blahblah..blahblah 100755 --- a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec +++ b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec @@ -129,8 +129,10 @@ Summary: The Linux kernel %define tarfile_release 5.16.0-0.rc5.6.test # This is needed to do merge window version magic %define patchlevel 16 -# allow pkg_release to have configurable %%{?dist} tag +# This allows pkg_release to have configurable %%{?dist} tag %define specrelease 0.rc5.6%{?buildid}%{?dist} +# This defines the kabi tarball version +%define kabiversion 5.16.0 # # End of genspec.sh variables @@ -829,8 +831,8 @@ Source211: Module.kabi_dup_ppc64le Source212: Module.kabi_dup_s390x Source213: Module.kabi_dup_x86_64 -Source300: kernel-abi-stablelists-%{specversion}-%{pkgrelease}.tar.bz2 -Source301: kernel-kabi-dw-%{specversion}-%{pkgrelease}.tar.bz2 +Source300: kernel-abi-stablelists-%{kabiversion}.tar.bz2 +Source301: kernel-kabi-dw-%{kabiversion}.tar.bz2 # Sources for kernel-tools Source2000: cpupower.service diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25 b/redhat/self-test/data/centos-2585cf9dfaad.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.fc25 +++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25 @@ -23,8 +23,8 @@ HEAD=2585cf9dfaad INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.test.tar.bz2 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.test.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0.tar.bz2 LANG=C LOCVERFILE=../localversion MACH=x86_64 @@ -55,6 +55,7 @@ SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec SPECINCLUDE_FEDORA_FILES=1 SPECINCLUDE_RHEL_FILES=1 +SPECKABIVERSION=5.16.0 SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec index blahblah..blahblah 100755 --- a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec +++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec @@ -129,8 +129,10 @@ Summary: The Linux kernel %define tarfile_release 5.16.0-0.rc5.6.test # This is needed to do merge window version magic %define patchlevel 16 -# allow pkg_release to have configurable %%{?dist} tag +# This allows pkg_release to have configurable %%{?dist} tag %define specrelease 0.rc5.6%{?buildid}%{?dist} +# This defines the kabi tarball version +%define kabiversion 5.16.0 # # End of genspec.sh variables @@ -829,8 +831,8 @@ Source211: Module.kabi_dup_ppc64le Source212: Module.kabi_dup_s390x Source213: Module.kabi_dup_x86_64 -Source300: kernel-abi-stablelists-%{specversion}-%{pkgrelease}.tar.bz2 -Source301: kernel-kabi-dw-%{specversion}-%{pkgrelease}.tar.bz2 +Source300: kernel-abi-stablelists-%{kabiversion}.tar.bz2 +Source301: kernel-kabi-dw-%{kabiversion}.tar.bz2 # Sources for kernel-tools Source2000: cpupower.service diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7 b/redhat/self-test/data/centos-78e36f3b0dae.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.el7 +++ b/redhat/self-test/data/centos-78e36f3b0dae.el7 @@ -23,8 +23,8 @@ HEAD=78e36f3b0dae INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.bz2 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0.tar.bz2 LANG=C LOCVERFILE=../localversion MACH=x86_64 @@ -55,6 +55,7 @@ SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec SPECINCLUDE_FEDORA_FILES=1 SPECINCLUDE_RHEL_FILES=1 +SPECKABIVERSION=5.17.0 SPECKEXTRAVERSION= SPECKPATCHLEVEL=17 SPECKSUBLEVEL=0 diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec index blahblah..blahblah 100755 --- a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec +++ b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec @@ -129,8 +129,10 @@ Summary: The Linux kernel %define tarfile_release 5.17.0-0.rc0.78e36f3b0dae.6.test # This is needed to do merge window version magic %define patchlevel 17 -# allow pkg_release to have configurable %%{?dist} tag +# This allows pkg_release to have configurable %%{?dist} tag %define specrelease 0.rc0.78e36f3b0dae.6%{?buildid}%{?dist} +# This defines the kabi tarball version +%define kabiversion 5.17.0 # # End of genspec.sh variables @@ -829,8 +831,8 @@ Source211: Module.kabi_dup_ppc64le Source212: Module.kabi_dup_s390x Source213: Module.kabi_dup_x86_64 -Source300: kernel-abi-stablelists-%{specversion}-%{pkgrelease}.tar.bz2 -Source301: kernel-kabi-dw-%{specversion}-%{pkgrelease}.tar.bz2 +Source300: kernel-abi-stablelists-%{kabiversion}.tar.bz2 +Source301: kernel-kabi-dw-%{kabiversion}.tar.bz2 # Sources for kernel-tools Source2000: cpupower.service diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25 b/redhat/self-test/data/centos-78e36f3b0dae.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.fc25 +++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25 @@ -23,8 +23,8 @@ HEAD=78e36f3b0dae INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.bz2 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae.6.test.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0.tar.bz2 LANG=C LOCVERFILE=../localversion MACH=x86_64 @@ -55,6 +55,7 @@ SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec SPECINCLUDE_FEDORA_FILES=1 SPECINCLUDE_RHEL_FILES=1 +SPECKABIVERSION=5.17.0 SPECKEXTRAVERSION= SPECKPATCHLEVEL=17 SPECKSUBLEVEL=0 diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec index blahblah..blahblah 100755 --- a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec +++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec @@ -129,8 +129,10 @@ Summary: The Linux kernel %define tarfile_release 5.17.0-0.rc0.78e36f3b0dae.6.test # This is needed to do merge window version magic %define patchlevel 17 -# allow pkg_release to have configurable %%{?dist} tag +# This allows pkg_release to have configurable %%{?dist} tag %define specrelease 0.rc0.78e36f3b0dae.6%{?buildid}%{?dist} +# This defines the kabi tarball version +%define kabiversion 5.17.0 # # End of genspec.sh variables @@ -829,8 +831,8 @@ Source211: Module.kabi_dup_ppc64le Source212: Module.kabi_dup_s390x Source213: Module.kabi_dup_x86_64 -Source300: kernel-abi-stablelists-%{specversion}-%{pkgrelease}.tar.bz2 -Source301: kernel-kabi-dw-%{specversion}-%{pkgrelease}.tar.bz2 +Source300: kernel-abi-stablelists-%{kabiversion}.tar.bz2 +Source301: kernel-kabi-dw-%{kabiversion}.tar.bz2 # Sources for kernel-tools Source2000: cpupower.service diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7 b/redhat/self-test/data/centos-df0cc57e057f.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-df0cc57e057f.el7 +++ b/redhat/self-test/data/centos-df0cc57e057f.el7 @@ -23,8 +23,8 @@ HEAD=df0cc57e057f INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.tar.bz2 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.test.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0.tar.bz2 LANG=C LOCVERFILE=../localversion MACH=x86_64 @@ -55,6 +55,7 @@ SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec SPECINCLUDE_FEDORA_FILES=1 SPECINCLUDE_RHEL_FILES=1 +SPECKABIVERSION=5.16.0 SPECKEXTRAVERSION= SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7.spec b/redhat/self-test/data/centos-df0cc57e057f.el7.spec index blahblah..blahblah 100755 --- a/redhat/self-test/data/centos-df0cc57e057f.el7.spec +++ b/redhat/self-test/data/centos-df0cc57e057f.el7.spec @@ -129,8 +129,10 @@ Summary: The Linux kernel %define tarfile_release 5.16.0-6.test # This is needed to do merge window version magic %define patchlevel 16 -# allow pkg_release to have configurable %%{?dist} tag +# This allows pkg_release to have configurable %%{?dist} tag %define specrelease 6%{?buildid}%{?dist} +# This defines the kabi tarball version +%define kabiversion 5.16.0 # # End of genspec.sh variables @@ -829,8 +831,8 @@ Source211: Module.kabi_dup_ppc64le Source212: Module.kabi_dup_s390x Source213: Module.kabi_dup_x86_64 -Source300: kernel-abi-stablelists-%{specversion}-%{pkgrelease}.tar.bz2 -Source301: kernel-kabi-dw-%{specversion}-%{pkgrelease}.tar.bz2 +Source300: kernel-abi-stablelists-%{kabiversion}.tar.bz2 +Source301: kernel-kabi-dw-%{kabiversion}.tar.bz2 # Sources for kernel-tools Source2000: cpupower.service diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25 b/redhat/self-test/data/centos-df0cc57e057f.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-df0cc57e057f.fc25 +++ b/redhat/self-test/data/centos-df0cc57e057f.fc25 @@ -23,8 +23,8 @@ HEAD=df0cc57e057f INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.test.tar.bz2 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.test.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0.tar.bz2 LANG=C LOCVERFILE=../localversion MACH=x86_64 @@ -55,6 +55,7 @@ SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec SPECINCLUDE_FEDORA_FILES=1 SPECINCLUDE_RHEL_FILES=1 +SPECKABIVERSION=5.16.0 SPECKEXTRAVERSION= SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec index blahblah..blahblah 100755 --- a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec +++ b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec @@ -129,8 +129,10 @@ Summary: The Linux kernel %define tarfile_release 5.16.0-6.test # This is needed to do merge window version magic %define patchlevel 16 -# allow pkg_release to have configurable %%{?dist} tag +# This allows pkg_release to have configurable %%{?dist} tag %define specrelease 6%{?buildid}%{?dist} +# This defines the kabi tarball version +%define kabiversion 5.16.0 # # End of genspec.sh variables @@ -829,8 +831,8 @@ Source211: Module.kabi_dup_ppc64le Source212: Module.kabi_dup_s390x Source213: Module.kabi_dup_x86_64 -Source300: kernel-abi-stablelists-%{specversion}-%{pkgrelease}.tar.bz2 -Source301: kernel-kabi-dw-%{specversion}-%{pkgrelease}.tar.bz2 +Source300: kernel-abi-stablelists-%{kabiversion}.tar.bz2 +Source301: kernel-kabi-dw-%{kabiversion}.tar.bz2 # Sources for kernel-tools Source2000: cpupower.service diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7 b/redhat/self-test/data/centos-fce15c45d3fb.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-fce15c45d3fb.el7 +++ b/redhat/self-test/data/centos-fce15c45d3fb.el7 @@ -23,8 +23,8 @@ HEAD=fce15c45d3fb INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.bz2 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0.tar.bz2 LANG=C LOCVERFILE=../localversion MACH=x86_64 @@ -55,6 +55,7 @@ SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec SPECINCLUDE_FEDORA_FILES=1 SPECINCLUDE_RHEL_FILES=1 +SPECKABIVERSION=5.16.0 SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec index blahblah..blahblah 100755 --- a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec +++ b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec @@ -129,8 +129,10 @@ Summary: The Linux kernel %define tarfile_release 5.16.0-0.rc5.fce15c45d3fb.6.test # This is needed to do merge window version magic %define patchlevel 16 -# allow pkg_release to have configurable %%{?dist} tag +# This allows pkg_release to have configurable %%{?dist} tag %define specrelease 0.rc5.fce15c45d3fb.6%{?buildid}%{?dist} +# This defines the kabi tarball version +%define kabiversion 5.16.0 # # End of genspec.sh variables @@ -829,8 +831,8 @@ Source211: Module.kabi_dup_ppc64le Source212: Module.kabi_dup_s390x Source213: Module.kabi_dup_x86_64 -Source300: kernel-abi-stablelists-%{specversion}-%{pkgrelease}.tar.bz2 -Source301: kernel-kabi-dw-%{specversion}-%{pkgrelease}.tar.bz2 +Source300: kernel-abi-stablelists-%{kabiversion}.tar.bz2 +Source301: kernel-kabi-dw-%{kabiversion}.tar.bz2 # Sources for kernel-tools Source2000: cpupower.service diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25 b/redhat/self-test/data/centos-fce15c45d3fb.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-fce15c45d3fb.fc25 +++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25 @@ -23,8 +23,8 @@ HEAD=fce15c45d3fb INCLUDE_FEDORA_FILES=1 INCLUDE_RHEL_FILES=1 KABIDW=../redhat/kabi-dwarf -KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.bz2 -KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fb.6.test.tar.bz2 +KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0.tar.bz2 +KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0.tar.bz2 LANG=C LOCVERFILE=../localversion MACH=x86_64 @@ -55,6 +55,7 @@ SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec SPECINCLUDE_FEDORA_FILES=1 SPECINCLUDE_RHEL_FILES=1 +SPECKABIVERSION=5.16.0 SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec index blahblah..blahblah 100755 --- a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec +++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec @@ -129,8 +129,10 @@ Summary: The Linux kernel %define tarfile_release 5.16.0-0.rc5.fce15c45d3fb.6.test # This is needed to do merge window version magic %define patchlevel 16 -# allow pkg_release to have configurable %%{?dist} tag +# This allows pkg_release to have configurable %%{?dist} tag %define specrelease 0.rc5.fce15c45d3fb.6%{?buildid}%{?dist} +# This defines the kabi tarball version +%define kabiversion 5.16.0 # # End of genspec.sh variables @@ -829,8 +831,8 @@ Source211: Module.kabi_dup_ppc64le Source212: Module.kabi_dup_s390x Source213: Module.kabi_dup_x86_64 -Source300: kernel-abi-stablelists-%{specversion}-%{pkgrelease}.tar.bz2 -Source301: kernel-kabi-dw-%{specversion}-%{pkgrelease}.tar.bz2 +Source300: kernel-abi-stablelists-%{kabiversion}.tar.bz2 +Source301: kernel-kabi-dw-%{kabiversion}.tar.bz2 # Sources for kernel-tools Source2000: cpupower.service diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7 b/redhat/self-test/data/fedora-2585cf9dfaad.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-2585cf9dfaad.el7 +++ b/redhat/self-test/data/fedora-2585cf9dfaad.el7 @@ -53,6 +53,7 @@ SPECCHANGELOG=kernel.changelog-9.99 SPECFILE=kernel.spec SPECINCLUDE_FEDORA_FILES=1 SPECINCLUDE_RHEL_FILES=1 +SPECKABIVERSION=5.16.0-0.rc5.6.test SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1801

3 3

[OS-BUILD PATCH] redhat/configs: Set CONFIG_VIRTIO_IOMMU on x86_64
by Eric Auger (via Email Bridge) 02 Jun '22

02 Jun '22

From: Eric Auger <eric.auger(a)redhat.com> redhat/configs: Set CONFIG_VIRTIO_IOMMU on x86_64 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2089765 Upstream Status: RHEL only Tested: with 9.1 guest featuring protected virtio-net-pci device We want to support the virtio-iommu on x86_64. So let's compile it. Signed-off-by: Eric Auger <eric.auger(a)redhat.com> diff --git a/redhat/configs/common/generic/x86/x86_64/CONFIG_VIRTIO_IOMMU b/redhat/configs/common/generic/x86/x86_64/CONFIG_VIRTIO_IOMMU new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/common/generic/x86/x86_64/CONFIG_VIRTIO_IOMMU @@ -0,0 +1 @@ +CONFIG_VIRTIO_IOMMU=y -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1799

2 2

[OS-BUILD PATCH 0/0] [redhat] New configs in init/Kconfig
by CKI Gitlab (via Email Bridge) 02 Jun '22

02 Jun '22

From: CKI Gitlab on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1828 NOTE: Truncated patchset due to missing public @redhat.com email address on your GitLab profile at https://gitlab.com/-/profile. Once that is fixed, close and reopen the merge request to retrigger sending the emails. Hi, As part of the ongoing rebase effort, the following configuration options need to be reviewed. As a reminder, the ARK configuration flow involves moving unreviewed configuration options from the pending directory to the ark directory. In the diff below, options are removed from the pending directory and added to the ark hierarchy. The final options that need to be ACKed are the files that are being added to the ark hierarchy. If the value for a file that is added should be changed, please reply with a better option. Symbol: MODULE_UNLOAD_TAINT_TRACKING [=n] Type : bool Defined at init/Kconfig:1986 Prompt: Tainted module unload tracking Depends on: MODULES [=y] && MODULE_UNLOAD [=y] Location: Main menu -> Enable loadable module support (MODULES [=y]) -> Module unloading (MODULE_UNLOAD [=y]) --- Cc: Prarit Bhargava <prarit(a)redhat.com> Cc: Aristeu Rozanski <arozansk(a)redhat.com> Cc: Artem Savkov <asavkov(a)redhat.com> Cc: Clark Williams <williams(a)redhat.com> Cc: "Herton R. Krzesinski" <herton(a)redhat.com> Cc: Jan Stancek <jstancek(a)redhat.com> Cc: Josh Poimboeuf <jpoimboe(a)redhat.com> Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org> --- redhat/configs/ark/generic/CONFIG_MODULE_UNLOAD_TAINT_TRACKING | 1 + redhat/configs/pending-ark/generic/CONFIG_MODULE_UNLOAD_TAINT_TRACKING | 13 ---------- 2 files changed, 1 insertions(+), 13 deletions(-)

4 6

[OS-BUILD PATCH 0/0] [redhat] New configs in init/Kconfig
by CKI Gitlab (via Email Bridge) 02 Jun '22

02 Jun '22

From: CKI Gitlab on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1833 NOTE: Truncated patchset due to missing public @redhat.com email address on your GitLab profile at https://gitlab.com/-/profile. Once that is fixed, close and reopen the merge request to retrigger sending the emails. Hi, As part of the ongoing rebase effort, the following configuration options need to be reviewed. As a reminder, the ARK configuration flow involves moving unreviewed configuration options from the pending directory to the ark directory. In the diff below, options are removed from the pending directory and added to the ark hierarchy. The final options that need to be ACKed are the files that are being added to the ark hierarchy. If the value for a file that is added should be changed, please reply with a better option. Symbol: INITRAMFS_PRESERVE_MTIME [=y] Type : bool Defined at init/Kconfig:1351 Prompt: Preserve cpio archive mtimes in initramfs Location: Main menu -> General setup --- Cc: Prarit Bhargava <prarit(a)redhat.com> Cc: Aristeu Rozanski <arozansk(a)redhat.com> Cc: Artem Savkov <asavkov(a)redhat.com> Cc: Clark Williams <williams(a)redhat.com> Cc: "Herton R. Krzesinski" <herton(a)redhat.com> Cc: Jan Stancek <jstancek(a)redhat.com> Cc: Josh Poimboeuf <jpoimboe(a)redhat.com> Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org> --- redhat/configs/ark/generic/CONFIG_INITRAMFS_PRESERVE_MTIME | 1 + redhat/configs/pending-ark/generic/CONFIG_INITRAMFS_PRESERVE_MTIME | 11 ---------- 2 files changed, 1 insertions(+), 11 deletions(-)

2 1

[OS-BUILD PATCH] redhat/configs/README: Update the README
by Prarit Bhargava (via Email Bridge) 01 Jun '22

01 Jun '22

From: Prarit Bhargava <prarit(a)redhat.com> redhat/configs/README: Update the README The information in this file was a bit out-of-date and needed a refresh. Update the README. Signed-off-by: Prarit Bhargava <prarit(a)redhat.com> diff --git a/redhat/configs/README b/redhat/configs/README index blahblah..blahblah 100644 --- a/redhat/configs/README +++ b/redhat/configs/README @@ -1,63 +1,84 @@ -Red Hat Enterprise Linux Always Ready config option scheme ------------------------------------------------------- +kernel-ark CONFIG option scheme +------------------------------- -Historically, the RHEL kernel is forked from a Fedora kernel. -Today, the Always Ready Kernel (ARK) is constantly rebased as new kernel -releases come out. New configuration options are reviewed and set -with each release. +The kernel-ark repository contains both Fedora and ark (aka "RHEL next") +CONFIGS. This repository is constantly rebased as the upstream kernel releases +new kernel version. New configuration options are reviewed and set with each +release, typically during the -rc1 to -rc3 releases. -The config options are split out into a hierarchical -tree structure, with one file per config option at each level of the -hierarchy. The config options are merged and properly layered according to -the file "priority" in the same directory as this README to generate the -final kernel-$VERSION-<arch>-<variant>.config files we need for building the -actual kernels. +The kernel-ark configs are broken out into ark, fedora, and common directories +in which each directory provides a heirarchical layout of the configs starting +with generic/CONFIG_* and debug/CONFIG_*, then generic/<arch>/CONFIG_* and +generic/<arch>/<variant>/CONFIG_*, debug/<arch>/CONFIG_*, etc. Users should be +aware that it may not necessarily be the case that architecture support is +consistent between ark and fedora. + +The config options are merged and properly layered according to the priority.* +files in the same directory as this README to generate the final +kernel-$VERSION-<arch>-<variant>.config files we need for building the actual +kernels. For example, the ark variant priorities are found in priority.rhel, +and in the case of x86_64 architecture, the specific information required is, + +ORDER=common ark pending-ark custom-overrides + +and + +x86_64=generic:generic-x86:generic-x86-x86_64 + +This indicates that for the x86_64 variant, the order that of inheritance would be: + +custom-overrides/generic/x86/x86_64 (highest override priority) +custom-overrides/generic/x86 +custom-overrides/generic +pending-ark/generic/x86/x86_64 +pending-ark/generic/x86 +pending-ark/generic +ark/generic/x86/x86_64 +ark/generic/x86 +ark/generic +common/generic/x86/x86_64 +common/generic/x86 +common/generic (lowest override priority) + +A text-based graphical representation of a specific CONFIG can be viewed +by using the evaluate_configs utility in this directory. + + ex) evaluate_configs -p priority.rhel -c CONFIG_PCI + +Directory Layout +---------------- The configuration is broken down into several directories: -ark - This contains all configuration options that have been fully -reviewed by kernel developers and are suitable for inclusion at branch time. - -pending-common - This directory contains all configuration options that have -not yet been fully reviewed for inclusion. Because of the rate at which -kernel options come out, we can't guarantee everything has been reviewed -by the time a build needs to happen. In the interest of letting the build -proceed for other testing, configuration options are staged in the -pending directory. It is expected that this directory will be empty -at branch time. - -In each directory (ark etc.), we have generic/CONFIG_* and debug/CONFIG_*, then -generic/<arch>/CONFIG_* and generic/<arch>/<variant>/CONFIG_*, as well as -debug/<arch>/CONFIG_*. While this may seem overly complex compared with -past RHEL kernel config setups at first glance, its actually quite -straight-forward and should be less error-prone. There's no potential -for configuration options getting out of order or conflicts when changing -adjacent configuraiton options. - -pending-fedora - This directory contains configuration options that have not -been reviewed by Fedora kernel maintainers. Since the Fedora kernel turns on -more configuration options than ARK, there are often settings that are not set -to default in pending-common. These settings are moved to the fedora/ -configuration directory after community review. Options are populated with -"make FLAVOR=fedora dist-commit-configs". - -custom-overrides - This directory contains an empty set of the generic and debug -arch-specific directory tree. Any config option set here is applied last and -therefore will override anything set in the ark, fedora, or pending directories. -This allows users to easily override a config option without altering the -standard directories. Users can even maintain their own branch with a full set -of custom configuration options that can be easily be rebased on top of -os-build without worrying about conflicts. - -All the configuration options for each arch and variant can be found -in the "priority" file. - -If you want to make a change that applies to all kernels, debug and -non-debug alike, add a config option file under ark/generic/. If it should -only apply to all debug kernels, add it under ark/debug/. Arch-specific -options go under ark/generic/<arch>/ and so on. Each layer's individual config -option files are concatenated together with all other options at the same -level, then stacked atop the lower layers until reaching the highest -precedence layer for the given config option. - -Send any questions, comments or concerns to rhkernel-list(a)redhat.com. +ark - contains all configuration options that have been reviewed by kernel +developers for the ark kernel. + +common - contains all configuration options that are common between the fedora +and ark directories. In other words, these config settings apply to both +fedora and ark. + +custom-overrides - contains an empty set of the generic and debug arch-specific +directory tree. Any config option set here is applied last and therefore will +override anything set in the ark, fedora, or pending directories. This feature +was added to assist users executing custom builds to easily override a config +option without altering the standard directories. Users can even maintain their +own branch with a full set of custom configuration options that can be easily +be rebased on top of os-build without worrying about conflicts. + +fedora - contains all configuration options that have been reviewed by kernel +developers for the fedora kernel. + +pending-[ark][common][fedora] - These directories contain configuration options +that have not yet been fully reviewed for inclusion for ark, fedora, and both +(common) kernels. Due to the rate at which kernel options come out, the kernel +maintainers cannot guarantee reviews of configs in these directories by the +time a build occurs. In the interest of letting the build proceed for other +testing, configuration options are staged in these pending directories. + + As pending-* configs are reviewed, they are moved into the matching non-pending +directory (ie, pending-ark -> ark, etc.) and it is expected that these +directories will be empty at branch time. + + The config file can be populated using the pending-* directories by using the +"FLAVOR" Makefile variable; for example to build the fedora configs, users can +execute "make FLAVOR=fedora dist-commit-configs". -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1841

3 9

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

kernel June 2022