kernel August 2023

kernel@lists.fedoraproject.org

3 participants
61 discussions

[OS-BUILD PATCH] Add wildcard macros -baseonly -gcov
by Don Zickus (via Email Bridge) 18 Sep '24

18 Sep '24

From: Don Zickus <dzickus(a)redhat.com> Add wildcard macros -baseonly -gcov There are multiple usecases for -baseonly and -gcov on various targets in the Makefile. Instead of calling those targets out repeatedly, lets generalize them a bit. Allow adding -baseonly and -gcov to: dist-rpm dist-srpm dist-brew dist-koji distg-brew distg-koji Gcov is useful for adding code coverage. Baseonly is useful to only build the kernel for debugging purposes without userspace tools. Signed-off-by: Don Zickus <dzickus(a)redhat.com> diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -297,6 +297,12 @@ dist-sources: dist-kabi dist-kabi-dup sources-rh dist-test-patch: generate-testpatch-tmp @mv $(TESTPATCH).tmp $(TESTPATCH); +%-baseonly: RPMBUILDOPTS=--target $(MACH) --without debug --without debuginfo --without vdso_install --without bpftool --without perf --without tools --without selftests -bb +%-baseonly: BUILDOPTS+=-debug -debuginfo -vdso_install -bpftool -perf -tools -selftests + +%-gcov: BUILDID=".gcov" +%-gcov: BUILDOPTS+="+gcov" + do-rpmbuild: dist-sources $(RPMBUILD) --define "_sourcedir $(SOURCES)" --define "_builddir $(RPM)/BUILD" --define "_srcrpmdir $(RPM)/SRPMS" --define "_rpmdir $(RPM)/RPMS" --define "_specdir $(RPM)/SPECS" --define "dist $(DIST)" $(RPMBUILDOPTS) $(RPM)/SOURCES/$(PACKAGE_NAME).spec @@ -306,9 +312,9 @@ dist-all-rpms: dist-sources do-rpmbuild dist-srpm: RPMBUILDOPTS=--nodeps -bs dist-srpm: dist-sources do-rpmbuild -dist-srpm-gcov: BUILDID=".gcov" -dist-srpm-gcov: BUILDOPTS+="+gcov" -dist-srpm-gcov: dist-srpm +dist-srpm-%: dist-srpm + @# phony command to force this to be a target and not variable + @FOO=BAR dist-rpms: RPMBUILDOPTS=--target $(MACH) -bb dist-rpms: dist-sources do-rpmbuild @@ -322,8 +328,7 @@ dist-prep: dist-sources do-rpmbuild dist-perf: RPMBUILDOPTS=--without up --without smp --without zfcpdump --without debug --without doc --without headers --without --without doc --without debuginfo --target $(MACH) -bb dist-perf: dist-sources do-rpmbuild -dist-rpm-baseonly: RPMBUILDOPTS=--target $(MACH) --without debug --without debuginfo --without vdso_install --without bpftool --without perf --without tools -bb -dist-rpm-baseonly: dist-sources do-rpmbuild +dist-rpm-%: dist-sources do-rpmbuild # unless you know what you're doing, you don't want to use the next four ones dist-release-finish: setup-source @@ -388,9 +393,25 @@ distg-koji: BUILD_FLAGS ?= $(KOJI_FLAGS) $(TEST_FLAGS) dist-brew dist-koji: dist-%: dist-srpm $* $(BUILD_PROFILE) build $(BUILD_FLAGS) $(BUILD_TARGET) $(SRPMS)/$(PACKAGE_NAME)-$(KVERSION)-$(PKGRELEASE)$(DIST).src.rpm $(OUTPUT_FILE) +dist-brew-%: dist-brew + @# phony command to force this to be a target and not variable + @FOO=BAR + +dist-koji-%: dist-koji + @# phony command to force this to be a target and not variable + @FOO=BAR + distg-brew distg-koji: distg-%: $* $(BUILD_PROFILE) build $(BUILD_FLAGS) $(BUILD_TARGET) "$(RHGITURL)?redhat/koji#$(RHGITCOMMIT)" +distg-brew-%: dist-brew + @# phony command to force this to be a target and not variable + @FOO=BAR + +distg-koji-%: dist-koji + @# phony command to force this to be a target and not variable + @FOO=BAR + .PHONY: $(REDHAT)/rpm/SOURCES/$(PACKAGE_NAME).spec $(REDHAT)/rpm/SOURCES/$(PACKAGE_NAME).spec: @echo "dist-sources" @@ -469,34 +490,30 @@ dist-full-help: @echo 'Building targets:' @echo ' All RPM/SRPM files will be put under the redhat/rpm/ directory.' @echo '' - @echo ' dist-srpm - Create a source RPM and put it into the redhat/rpm/SRPMS/' + @echo ' dist-srpm@ - Create a source RPM and put it into the redhat/rpm/SRPMS/' @echo ' directory. See the dist-brew target for available options.' - @echo ' dist-srpm-gcov - Create a source RPM with gcov enabled and put it into the' - @echo ' redhat/rpm/SRPMS/ directory.' - @echo ' dist-brew - Create a kernel SRPM and then call brew to build the' + @echo ' dist-brew@ - Create a kernel SRPM and then call brew to build the' @echo ' created SRPM. Add BUILDOPTS="+<opt> -<opt> [...]" to' @echo ' enable/disable build options.' @echo ' Available <opt>s and their default values:' \ $$(sed -n -e 's/^%define with_$[^ \t]*$.*\?_without_.*/+\1/p' \ -e 's/^%define with_$[^ \t]*$.*\?_with_.*/-\1/p' kernel.spec.template | \ grep -v 'only$$') | fmt -80 - @echo ' dist-koji - Create a kernel SRPM and then call koji to build the' + @echo ' dist-koji@ - Create a kernel SRPM and then call koji to build the' @echo ' created SRPM. See the dist-brew target for available' @echo ' options.' - @echo ' distg-brew - Pass HEAD of the current git branch to brew to build an' + @echo ' distg-brew@ - Pass HEAD of the current git branch to brew to build an' @echo ' RPM set. Do not forget to push to the remote repository' @echo ' first. Preceed make command by RHGITCOMMIT=<commitID>' @echo ' specify commit ID to use.' @echo ' To set the remote repo, invoke:' @echo ' git config rhg.url git://<repo_path>' - @echo ' distg-koji - Pass HEAD of the current git branch to koji to build an' + @echo ' distg-koji@ - Pass HEAD of the current git branch to koji to build an' @echo ' RPM set. Do not forget to push to the remote repository' @echo ' first. See the distg-brew target for options and' @echo ' configuration.' - @echo ' dist-rpms - Create the binary RPMS for the kernel.' + @echo ' dist-rpms@ - Create the binary RPMS for the kernel.' @echo ' See the dist-brew target for available options.' - @echo ' dist-rpm-baseonly - Create the binary RPMS for the kernel and modules' - @echo ' (no userspace tools or debuginfo).' @echo ' dist-kernel-<type> - Create binary RPMS for a particular kernel type.' @echo ' Available <type>s:'\ $$(sed -n 's/^%define with_$[^ ]*only$.*/\1/p' kernel.spec.template) @@ -524,6 +541,12 @@ dist-full-help: @echo ' dist-rhel-configs - build ELN configs' @echo ' dist-fedora-configs - build Fedora configs' + @echo '' + @echo 'Wildcard targets: [indicated by '@' above]' + @echo ' *-baseonly - builds only the kernel (disables userspace and debuginfo)' + @echo ' - Examples: dist-srpm-baseonly, dist-brew-baseonly' + @echo ' *-gcov - builds a kernel with gcov enabled' + @echo ' - Examples: dist-srpm-gcov, dist-brew-gcov' @echo '' @echo 'kABI targets:' @echo ' dist-kabi - Create kABI stablelist files in redhat/kabi/kabi-rhel*/' -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1444

3 2

[OS-BUILD PATCHv3 0/2] redhat: introduce RH_KABI_EXCLUDE_WITH_SIZE and enable size checks
by Sabrina Dubroca (via Email Bridge) 16 Nov '23

16 Nov '23

From: Sabrina Dubroca on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1619 This MR introduces a new kABI macro, RH_KABI_EXCLUDE_WITH_SIZE. The implementation is identical to RH_KABI_EXTEND_WITH_SIZE, but the meaning is more in line with RH_KABI_EXCLUDE. The size check and reserved space allows us to exclude an element embedded inside a kABI-protected structure while reserving space for it to grow in the future. The size checks that are part of multiple kABI macros are currently not enabled because the config option to turn them on is missing. Those size checks only make sense on regular builds, so they're disabled on debug kernels. Signed-off-by: Sabrina Dubroca <sdubroca(a)redhat.com> --- include/linux/rh_kabi.h | 26 ++++++++++ redhat/configs/ark/debug/CONFIG_RH_KABI_SIZE_ALIGN_CHECKS | 1 + redhat/configs/ark/generic/CONFIG_RH_KABI_SIZE_ALIGN_CHECKS | 1 + redhat/configs/ark/kgcov/CONFIG_RH_KABI_SIZE_ALIGN_CHECKS | 1 + redhat/configs/common/generic/CONFIG_RH_KABI_SIZE_ALIGN_CHECKS | 1 + Kconfig.redhat | 9 +++ 6 files changed, 39 insertions(+), 0 deletions(-)

4 7

[OS-BUILD PATCHv7 0/3] redhat: Keep track of SPDX-License-Identifier tags in the code
by Vitaly Kuznetsov (via Email Bridge) 01 Sep '23

01 Sep '23

From: Vitaly Kuznetsov on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2648 Be more picky about kernel's source code licenses: - Keep track of all currently used license in specfile template. - Add a selftest which checks all currently present license identifiers against License:. Signed-off-by: Vitaly Kuznetsov <vkuznets(a)redhat.com> --- redhat/scripts/kspdx-tool/kspdx.py | 231 +++++++++++++++++++++++++++++++ redhat/self-test/1007-spdx-licenses.bats | 60 ++++++++ redhat/Makefile | 10 + redhat/kernel.spec.template | 9 +- 4 files changed, 302 insertions(+), 8 deletions(-)

4 18

[OS-BUILD PATCH] Flip CONFIG_SND_SOC_CS35L56_SDW to m and clean up
by Justin M. Forbes (via Email Bridge) 31 Aug '23

31 Aug '23

From: Justin M. Forbes <jforbes(a)fedoraproject.org> Flip CONFIG_SND_SOC_CS35L56_SDW to m and clean up Upstream commit 4754e29c779fe makes SND_SOC_INTEL_SOUNDWIRE_SOF_MACH select SND_SOC_CS35L56. This was previously disabled in RHEL and the new select results in a mismatch. Let's turn on CONFIG_SND_SOC_CS35L56_SDW for x86 in common, and lean up all of the other references to it. Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org> diff --git a/redhat/configs/common/generic/CONFIG_SND_SOC_CS35L56_SDW b/redhat/configs/common/generic/CONFIG_SND_SOC_CS35L56_SDW deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/common/generic/CONFIG_SND_SOC_CS35L56_SDW +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_SND_SOC_CS35L56_SDW is not set diff --git a/redhat/configs/fedora/generic/CONFIG_SND_SOC_CS35L56_SDW b/redhat/configs/common/generic/x86/CONFIG_SND_SOC_CS35L56_SDW rename from redhat/configs/fedora/generic/CONFIG_SND_SOC_CS35L56_SDW rename to redhat/configs/common/generic/x86/CONFIG_SND_SOC_CS35L56_SDW index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_SND_SOC_CS35L56_SDW +++ b/redhat/configs/common/generic/x86/CONFIG_SND_SOC_CS35L56_SDW diff --git a/redhat/configs/pending-rhel/generic/CONFIG_SND_SOC_CS35L56_SDW b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_CS35L56_SDW rename from redhat/configs/pending-rhel/generic/CONFIG_SND_SOC_CS35L56_SDW rename to redhat/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_CS35L56_SDW index blahblah..blahblah 100644 --- a/redhat/configs/pending-rhel/generic/CONFIG_SND_SOC_CS35L56_SDW +++ b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_CS35L56_SDW diff --git a/redhat/configs/rhel/generic/CONFIG_SND_SOC_CS35L56_SDW b/redhat/configs/rhel/generic/CONFIG_SND_SOC_CS35L56_SDW deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/rhel/generic/CONFIG_SND_SOC_CS35L56_SDW +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_SND_SOC_CS35L56_SDW is not set -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2690

1 0

[OS-BUILD PATCHv6 0/3] redhat: Keep track of SPDX-License-Identifier tags in the code
by Vitaly Kuznetsov (via Email Bridge) 31 Aug '23

31 Aug '23

From: Vitaly Kuznetsov on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2648 Be more picky about kernel's source code licenses: - Keep track of all currently used license in specfile template. - Add a selftest which checks all currently present license identifiers against License:. Signed-off-by: Vitaly Kuznetsov <vkuznets(a)redhat.com> --- redhat/scripts/kspdx-tool/kspdx.py | 226 +++++++++++++++++++++++++++++++ redhat/self-test/1007-spdx-licenses.bats | 60 ++++++++ redhat/Makefile | 10 + redhat/kernel.spec.template | 9 +- 4 files changed, 297 insertions(+), 8 deletions(-)

1 3

[OS-BUILD PATCHv5 0/3] redhat: Keep track of SPDX-License-Identifier tags in the code
by Vitaly Kuznetsov (via Email Bridge) 31 Aug '23

31 Aug '23

From: Vitaly Kuznetsov on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2648 Be more picky about kernel's source code licenses: - Keep track of all currently used license in specfile template. - Add a selftest which checks all currently present license identifiers against License:. Signed-off-by: Vitaly Kuznetsov <vkuznets(a)redhat.com> --- redhat/scripts/kspdx-tool/kspdx.py | 225 +++++++++++++++++++++++++++++++ redhat/self-test/1007-spdx-licenses.bats | 60 ++++++++ redhat/Makefile | 10 + redhat/kernel.spec.template | 9 +- 4 files changed, 296 insertions(+), 8 deletions(-)

1 5

[OS-BUILD PATCHv5] Disable tests for ELN realtime pipelines
by Michael Hofmann (via Email Bridge) 31 Aug '23

31 Aug '23

From: Michael Hofmann <mhofmann(a)redhat.com> Disable tests for ELN realtime pipelines There is no real realtime variant on ELN atm as the realtime code is not yet merged upstream. Part of https://gitlab.com/redhat/centos-stream/tests/kernel/kpet-db/-/issues/134 Signed-off-by: Michael Hofmann <mhofmann(a)redhat.com> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index blahblah..blahblah 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -208,12 +208,12 @@ eln_debug_baseline: extends: [.baseline, .trigger_eln, .reported_tests, .ark_latest_head] variables: *eln-up-debug -eln_realtime_baseline: - extends: [.baseline, .trigger_eln, .reported_tests, .ark_latest_head] +eln_realtime_baseline: # no tests as realtime code not present upstream + extends: [.baseline, .trigger_eln, .no_tests, .ark_latest_head] variables: *eln-rt -eln_realtime_debug_baseline: - extends: [.baseline, .trigger_eln, .reported_tests, .ark_latest_head] +eln_realtime_debug_baseline: # no tests as realtime code not present upstream + extends: [.baseline, .trigger_eln, .no_tests, .ark_latest_head] variables: *eln-rt-debug eln_64k_baseline: -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2657

1 0

✅ PASS: Test report for 6.4.13-100.fc37 (kernel-fedora)
by cki-project＠redhat.com 30 Aug '23

30 Aug '23

Hi, we tested your kernel and here are the results: Overall result: PASSED Merge: OK Compile: OK Test: OK Tested-by: CKI Project <cki-project(a)redhat.com> Kernel information: Brew / Koji Task ID: 105532555 You can find all the details about the test run at https://datawarehouse.cki-project.org/kcidb/checkouts/102278 One or more kernel tests failed: We also see the following known issues which are not related to your changes: Issue: NFS Connectathon: SELinux prevents rpcbind URL: https://bugzilla.redhat.com/1758147 Affected tests: aarch64 - Filesystem - NFS Connectathon ppc64le - Filesystem - NFS Connectathon If you find a failure unrelated to your changes, please ask the test maintainer to review it. This will prevent the failures from being incorrectly reported in the future. Please reply to this email if you have any questions about the tests that we ran or if you have any suggestions on how to make future tests more effective. ,-. ,-. ( C ) ( K ) Continuous `-',-.`-' Kernel ( I ) Integration `-' ______________________________________________________________________________

1 0

[OS-BUILD PATCHv3] Fix tarball creation logic
by Don Zickus (via Email Bridge) 30 Aug '23

30 Aug '23

From: Don Zickus <dzickus(a)redhat.com> Fix tarball creation logic The create tarball logic tried to determine if the tarball existed or not by using a git sha. However the check always failed because the current sha was shortened and the tarball sha was the full 40 digits. Correct this by converting the shortened sha into the full sha so the comparison actually works. Signed-off-by: Don Zickus <dzickus(a)redhat.com> diff --git a/redhat/scripts/create-tarball.sh b/redhat/scripts/create-tarball.sh index blahblah..blahblah 100755 --- a/redhat/scripts/create-tarball.sh +++ b/redhat/scripts/create-tarball.sh @@ -9,6 +9,9 @@ XZ_THREADS="--threads $RHJOBS" ARCH=$(arch) XZ_OPTIONS="" +# convert from shortened git sha to standard 40 digit git sha +_GITID="$(git rev-parse "$_GITID")" + if [ "$ARCH" != "x86_64" ] then XZ_OPTIONS="-M 3G" -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2658

2 2

[OS-BUILD PATCH] redhat: bump libcpupower soname to match upstream
by Patrick Talbert (via Email Bridge) 30 Aug '23

30 Aug '23

From: Patrick Talbert <ptalbert(a)redhat.com> redhat: bump libcpupower soname to match upstream Since d7de5d8e ('cpupower: Bump soname version') the cpupower library soname has been bumped from libcpupower.so.0 to libcpupower.so.1. Signed-off-by: Patrick Talbert <ptalbert(a)redhat.com> diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index blahblah..blahblah 100644 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -3471,7 +3471,7 @@ fi\ %ifarch %{cpupowerarchs} %files -n %{package_name}-tools-libs -%{_libdir}/libcpupower.so.0 +%{_libdir}/libcpupower.so.1 %{_libdir}/libcpupower.so.0.0.1 %files -n %{package_name}-tools-libs-devel -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2663

3 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

kernel August 2023