From: David Arcari <darcari(a)redhat.com>
redhat/configs: Enable CONFIG_AMDTEE for x86
This config is required in order for CONFIG_AMD_PMF to be enabled.
Signed-off-by: David Arcari <darcari(a)redhat.com>
diff --git a/redhat/configs/common/generic/x86/CONFIG_AMDTEE b/redhat/configs/common/generic/x86/CONFIG_AMDTEE
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/x86/CONFIG_AMDTEE
@@ -0,0 +1 @@
+CONFIG_AMDTEE=m
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3049
From: Mark Salter <msalter(a)redhat.com>
redhat/configs: aarch64: Enable ARM_FFA driver
Some newer platforms are making use of the Arm Firmaware Framework, so
lets enable it for RHEL also.
Signed-off-by: Mark Salter <msalter(a)redhat.com>
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ARM_FFA_TRANSPORT b/redhat/configs/common/generic/arm/aarch64/CONFIG_ARM_FFA_TRANSPORT
rename from redhat/configs/fedora/generic/arm/aarch64/CONFIG_ARM_FFA_TRANSPORT
rename to redhat/configs/common/generic/arm/aarch64/CONFIG_ARM_FFA_TRANSPORT
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ARM_FFA_TRANSPORT
+++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_ARM_FFA_TRANSPORT
diff --git a/redhat/configs/rhel/generic/arm/aarch64/CONFIG_ARM_FFA_TRANSPORT b/redhat/configs/rhel/generic/arm/aarch64/CONFIG_ARM_FFA_TRANSPORT
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/rhel/generic/arm/aarch64/CONFIG_ARM_FFA_TRANSPORT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ARM_FFA_TRANSPORT is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3048
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: 115487404
You can find all the details about the test run at
https://datawarehouse.cki-project.org/kcidb/checkouts/137521
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
`-'
______________________________________________________________________________
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