Hey All,
I would like to invite all of you to participate in the Kernel 6.8
Test week is happening from 2024-03-24 to 2024-03-31. 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 questions and discussion.
[0] http://fedoraproject.org/wiki/Test_Day:2024-03-24_Kernel_6.8_Test_Week
[1] https://testdays.fedoraproject.org/events/184
--
//sumantro
Fedora QE
TRIED AND PERSONALLY TESTED, ERGO TRUSTED
From: Don Zickus <dzickus(a)redhat.com>
Base automotive-devel on rt-devel
The -rt kernel will be integrated into the CentOS-Stream/RHEL-10 kernel
and the automotive kernel will be a derivative of that. So instead of
building the automotive kernel off of os-build, instead build it off of
the os-build-rt-devel kernel which mimics the CS/RHEL10 workflow.
Signed-off-by: Don Zickus <dzickus(a)redhat.com>
diff --git a/redhat/scripts/ci/ark-merge-rt.sh b/redhat/scripts/ci/ark-merge-rt.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/ci/ark-merge-rt.sh
+++ b/redhat/scripts/ci/ark-merge-rt.sh
@@ -140,8 +140,12 @@ if test "$UPSTREAM_RT_DEVEL_VER" != "$RT_DEVEL_VER" -o \
git checkout "$prev_branch"
# do the git rebase --onto $temp_devel_branch $temp_prev_branch
+ prev_rt_branch="$(git rev-parse --abbrev-ref $RT_DEVEL_BRANCH)"
ark_git_rebase "$RT_DEVEL_BRANCH" "$temp_prev_branch" "$temp_devel_branch"
- ark_git_rebase "$AUTOMOTIVE_DEVEL_BRANCH" "$temp_prev_branch" "$temp_devel_branch"
+
+ # use the pre-rebase rt-devel branch and the post-rebase rt-devel
+ # branch as input to git rebase
+ ark_git_rebase "$AUTOMOTIVE_DEVEL_BRANCH" "$prev_rt_branch" "$RT_DEVEL_BRANCH"
git branch -D "$temp_prev_branch"
git branch -D "$temp_devel_branch"
fi
@@ -154,9 +158,9 @@ ark_update_configs "$RT_DEVEL_BRANCH" || true
# skip pushing config update MRs, keep them in pending-rhel
ark_push_changes "$RT_DEVEL_BRANCH" "skip"
-## Build -automotive-devel branch, generate pending-rhel configs
-ark_git_merge "$AUTOMOTIVE_DEVEL_BRANCH" "$OS_BUILD_BASE_BRANCH"
-ark_git_merge "$AUTOMOTIVE_DEVEL_BRANCH" "$UPSTREAM_RT_TREE_NAME/$UPSTREAM_RT_DEVEL_BRANCH"
+## Build -automotive-devel branch based on the rt-devel branch, generate
+## pending-rhel configs
+ark_git_merge "$AUTOMOTIVE_DEVEL_BRANCH" "$RT_DEVEL_BRANCH"
# don't care if configs were added or not hence '|| true'
ark_update_configs "$AUTOMOTIVE_DEVEL_BRANCH" || true
# skip pushing config update MRs, keep them in pending-rhel
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3047
From: Jan Stancek <jstancek(a)redhat.com>
redhat: make libperf-devel require libperf %{version}-%{release}
Forward-port of c9s commit:
a84991c38dd1 ("redhat: make libperf-devel require libperf %{version}-%{release}")
Add Requires to address potential issue found by rpminspect:
Subpackage libperf-devel on aarch64 carries 'Requires: libperf.so()(64bit)'
which comes from subpackage libperf but does not carry an explicit package
version requirement. Please add 'Requires: libperf = %{version}-%{release}'
to the spec file to avoid the need to test interoperability between various
combinations of old and new subpackages.
Signed-off-by: Jan Stancek <jstancek(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
@@ -1133,6 +1133,7 @@ This package contains the kernel source perf library.
%package -n libperf-devel
Summary: Developement files for the perf library from kernel source
+Requires: libperf = %{version}-%{release}
%description -n libperf-devel
This package includes libraries and header files needed for development
of applications which use perf library from kernel source.
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3045
From: Jan Stancek <jstancek(a)redhat.com>
kernel.spec: drop custom mode also for System.map ghost entry
/lib/kernel/install.d/20-grub.install copies System.map to /boot
with same attributes it has in /lib/, which creates mismatch between
attributes in spec and attributes on file systems. So, right after
installation "rpm -V" reports 'M' (Mode differs).
Fixes: bda59a14d7a3 ("Drop custom mode for System.map file")
Signed-off-by: Jan Stancek <jstancek(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
@@ -3822,7 +3822,7 @@ fi\
%ghost /%{image_install_path}/dtb-%{KVERREL}%{?3:+%{3}} \
%endif\
/lib/modules/%{KVERREL}%{?3:+%{3}}/System.map\
-%ghost %attr(0600, root, root) /boot/System.map-%{KVERREL}%{?3:+%{3}}\
+%ghost /boot/System.map-%{KVERREL}%{?3:+%{3}}\
%dir /lib/modules\
%dir /lib/modules/%{KVERREL}%{?3:+%{3}}\
/lib/modules/%{KVERREL}%{?3:+%{3}}/symvers.%compext\
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3044
From: Jan Stancek <jstancek(a)redhat.com>
kernel.spec: fix libperf-debuginfo content
Forward-port c9s commit:
bd17da749d74 ("[redhat] kernel.spec: fix libperf-debuginfo content")
Due to incorrect searching pattern, libperf-debuginfo package
contained only symlinks and actual libperf.so.0.0.1.debug went
into kernel-debuginfo-common package.
Fix the search pattern, so that
/usr/lib/debug/usr/lib64/libperf.so.0.0.1.debug
gets into the proper debuginfo subpackage.
Signed-off-by: Michael Petlan <mpetlan(a)redhat.com>
Signed-off-by: Jan Stancek <jstancek(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
@@ -1149,7 +1149,7 @@ This package provides debug information for the libperf package.
# symlinks because of the trailing nonmatching alternation and
# the leading .*, because of find-debuginfo.sh's buggy handling
# of matching the pattern against the symlinks file.
-%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{_libdir}/libperf.so(\.debug)?|XXX' -o libperf-debuginfo.list}
+%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{_libdir}/libperf.so.*(\.debug)?|XXX' -o libperf-debuginfo.list}
# with_libperf
%endif
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3043
From: Scott Weaver <scweaver(a)redhat.com>
redhat/kernel.spec.template: add extra flags for tools build
With 01474dc706cab ('tools/rtla: Use tools/build makefiles to build
rtla') a feature check was added to ensure the build dependencies are
installed. Due to a compiler/linker object type mismatch that test fails
to build and incorrectly reports that the libtracefs dependency is not
installed when in fact it is.
01:01:25 Auto-detecting system features:
01:01:25 ... libtraceevent: [on]
01:01:25 ... libtracefs: [OFF]
01:01:25
01:01:26 libtracefs is missing. Please install libtracefs-dev/libtracefs-devel
01:01:26 Makefile.config:46: *** Please, check the errors above.. Stop.
The feature check error being reported:
usr/bin/ld: /tmp/cc7X1j0w.o: relocation R_X86_64_32 against `.rodata'
can not be used when making a PIE object; recompile with -fPIE
/usr/bin/ld: failed to set dynamic section sizes: bad value collect2:
error: ld returned 1 exit status
Signed-off-by: Scott Weaver <scweaver(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
@@ -2852,7 +2852,7 @@ chmod +x tools/perf/check-headers.sh
%endif
%global tools_make \
- CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{make} %{?make_opts}
+ CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" EXTRA_CFLAGS="${RPM_OPT_FLAGS}" %{make} %{?make_opts}
%if %{with_tools}
%ifarch %{cpupowerarchs}
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3033
From: Jerry Snitselaar <jsnitsel(a)redhat.com>
redhat/configs: Enable CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON for rhel
Enable Intel Scalable Mode to default to on for systems that support it.
Move Fedora config to common/generic/x86, and drop the old common/generic where
it was disabled.
Signed-off-by: Jerry Snitselaar <jsnitsel(a)redhat.com>
diff --git a/redhat/configs/common/generic/CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON b/redhat/configs/common/generic/CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/common/generic/CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON b/redhat/configs/common/generic/x86/CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON
rename from redhat/configs/fedora/generic/x86/CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON
rename to redhat/configs/common/generic/x86/CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/x86/CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON
+++ b/redhat/configs/common/generic/x86/CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3041
From: Scott Weaver <scweaver(a)redhat.com>
redhat/kernel.spec.template: update license
The license check fails due to missing the dual license:
"BSD-2-Clause OR Apache-2.0"
With c150b809f7de2 ('Merge tag 'riscv-for-linus-6.9-mw2') new dual
licensed files were added.
Signed-off-by: Scott Weaver <scweaver(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
@@ -632,7 +632,7 @@ Summary: The Linux kernel
Name: %{package_name}
-License: ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-2-Clause) AND ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-3-Clause) AND ((GPL-2.0-only WITH Linux-syscall-note) OR CDDL-1.0) AND ((GPL-2.0-only WITH Linux-syscall-note) OR Linux-OpenIB) AND ((GPL-2.0-only WITH Linux-syscall-note) OR MIT) AND ((GPL-2.0-or-later WITH Linux-syscall-note) OR BSD-3-Clause) AND ((GPL-2.0-or-later WITH Linux-syscall-note) OR MIT) AND BSD-2-Clause AND BSD-3-Clause AND BSD-3-Clause-Clear AND GFDL-1.1-no-invariants-or-later AND GPL-1.0-or-later AND (GPL-1.0-or-later OR BSD-3-Clause) AND (GPL-1.0-or-later WITH Linux-syscall-note) AND GPL-2.0-only AND (GPL-2.0-only OR Apache-2.0) AND (GPL-2.0-only OR BSD-2-Clause) AND (GPL-2.0-only OR BSD-3-Clause) AND (GPL-2.0-only OR CDDL-1.0) AND (GPL-2.0-only OR GFDL-1.1-no-invariants-or-later) AND (GPL-2.0-only OR GFDL-1.2-no-invariants-only) AND (GPL-2.0-only WITH Linux-syscall-note) AND GPL-2.0-or-later AND (GPL-2.0-or-later OR BSD-2-Clause) AND (GPL-2.0-or-later OR BSD-3-Clause) AND (GPL-2.0-or-later OR CC-BY-4.0) AND (GPL-2.0-or-later WITH GCC-exception-2.0) AND (GPL-2.0-or-later WITH Linux-syscall-note) AND ISC AND LGPL-2.0-or-later AND (LGPL-2.0-or-later OR BSD-2-Clause) AND (LGPL-2.0-or-later WITH Linux-syscall-note) AND LGPL-2.1-only AND (LGPL-2.1-only OR BSD-2-Clause) AND (LGPL-2.1-only WITH Linux-syscall-note) AND LGPL-2.1-or-later AND (LGPL-2.1-or-later WITH Linux-syscall-note) AND (Linux-OpenIB OR GPL-2.0-only) AND (Linux-OpenIB OR GPL-2.0-only OR BSD-2-Clause) AND Linux-man-pages-copyleft AND MIT AND (MIT OR Apache-2.0) AND (MIT OR GPL-2.0-only) AND (MIT OR GPL-2.0-or-later) AND (MIT OR LGPL-2.1-only) AND (MPL-1.1 OR GPL-2.0-only) AND (X11 OR GPL-2.0-only) AND (X11 OR GPL-2.0-or-later) AND Zlib AND (copyleft-next-0.3.1 OR GPL-2.0-or-later)
+License: ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-2-Clause) AND ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-3-Clause) AND ((GPL-2.0-only WITH Linux-syscall-note) OR CDDL-1.0) AND ((GPL-2.0-only WITH Linux-syscall-note) OR Linux-OpenIB) AND ((GPL-2.0-only WITH Linux-syscall-note) OR MIT) AND ((GPL-2.0-or-later WITH Linux-syscall-note) OR BSD-3-Clause) AND ((GPL-2.0-or-later WITH Linux-syscall-note) OR MIT) AND BSD-2-Clause AND (BSD-2-Clause OR Apache-2.0) AND BSD-3-Clause AND BSD-3-Clause-Clear AND GFDL-1.1-no-invariants-or-later AND GPL-1.0-or-later AND (GPL-1.0-or-later OR BSD-3-Clause) AND (GPL-1.0-or-later WITH Linux-syscall-note) AND GPL-2.0-only AND (GPL-2.0-only OR Apache-2.0) AND (GPL-2.0-only OR BSD-2-Clause) AND (GPL-2.0-only OR BSD-3-Clause) AND (GPL-2.0-only OR CDDL-1.0) AND (GPL-2.0-only OR GFDL-1.1-no-invariants-or-later) AND (GPL-2.0-only OR GFDL-1.2-no-invariants-only) AND (GPL-2.0-only WITH Linux-syscall-note) AND GPL-2.0-or-later AND (GPL-2.0-or-later OR BSD-2-Clause) AND (GPL-2.0-or-later OR BSD-3-Clause) AND (GPL-2.0-or-later OR CC-BY-4.0) AND (GPL-2.0-or-later WITH GCC-exception-2.0) AND (GPL-2.0-or-later WITH Linux-syscall-note) AND ISC AND LGPL-2.0-or-later AND (LGPL-2.0-or-later OR BSD-2-Clause) AND (LGPL-2.0-or-later WITH Linux-syscall-note) AND LGPL-2.1-only AND (LGPL-2.1-only OR BSD-2-Clause) AND (LGPL-2.1-only WITH Linux-syscall-note) AND LGPL-2.1-or-later AND (LGPL-2.1-or-later WITH Linux-syscall-note) AND (Linux-OpenIB OR GPL-2.0-only) AND (Linux-OpenIB OR GPL-2.0-only OR BSD-2-Clause) AND Linux-man-pages-copyleft AND MIT AND (MIT OR Apache-2.0) AND (MIT OR GPL-2.0-only) AND (MIT OR GPL-2.0-or-later) AND (MIT OR LGPL-2.1-only) AND (MPL-1.1 OR GPL-2.0-only) AND (X11 OR GPL-2.0-only) AND (X11 OR GPL-2.0-or-later) AND Zlib AND (copyleft-next-0.3.1 OR GPL-2.0-or-later)
URL: https://www.kernel.org/
Version: %{specrpmversion}
Release: %{pkg_release}
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3040