From: Philipp Rudo <prudo(a)redhat.com>
kernel.spec: Fix UKI naming to comply with BLS
The Boot Loader Specification (BLS) [1] suggests that type #2 entries (UKIs)
shall have the same names like type #1 entries with the exception of
the suffix being .efi instead of .conf. In particular this means that
the name for installed UKIs should be
<entry-token-or-machine-id>-<version>.efi. The same naming convention is
used by kernel-installs 90-uki-copy.install [2] in systemd v253.
Adjust the workaround to install UKIs in the kernel.spec to follow the
same naming convention in order to prevent breaking user space tools
that rely on it.
[1] https://uapi-group.org/specifications/specs/boot_loader_specification/
[2] https://github.com/systemd/systemd/blob/v253/src/kernel-install/90-uki-copy…
Signed-off-by: Philipp Rudo <prudo(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
@@ -3033,10 +3033,12 @@ touch %{_localstatedir}/lib/rpm-state/%{name}/installing_core_%{KVERREL}%{?-v:+%
%define kernel_uki_virt_scripts() \
%{expand:%%posttrans %{?1:%{1}-}uki-virt}\
mkdir -p /boot/efi/EFI/Linux\
-cp /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz-virt.efi /boot/efi/EFI/Linux/vmlinuz-%{KVERREL}%{?1:+%{1}}-virt.efi\
+entry_token=$(kernel-install inspect | grep KERNEL_INSTALL_ENTRY_TOKEN: | cut -d ' ' -f2)\
+cp /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz-virt.efi /boot/efi/EFI/Linux/${entry_token}-%{KVERREL}%{?1:+%{1}}.efi\
%{nil}\
%{expand:%%postun %{?1:%{1}-}uki-virt}\
-rm -f /boot/efi/EFI/Linux/vmlinuz-%{KVERREL}%{?1:+%{1}}-virt.efi\
+entry_token=$(kernel-install inspect | grep KERNEL_INSTALL_ENTRY_TOKEN: | cut -d ' ' -f2)\
+rm -f /boot/efi/EFI/Linux/${entry_token}-%{KVERREL}%{?1:+%{1}}.efi\
%{nil}
#
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2391
Hi,
I'm working on libtraceevent and libtracefs update. There will be soname
bump happening to them. Namely,
libtraceevent.so 1.6.3 -> 1.7.2
libtracefs.so 1.5.0 -> 1.6.4
IIRC only kernel-tools (for perf and rtla) and trace-cmd depends on
them. So I'm also copying their corresponding contacts.
As for libtraceevent, I've tried running trace-cmd/perf/rtla with the
new version and they still works. So I've updated it in Rawhide, Fedora
38 and Fedora 37. They are now in Bodhi.
As for libtracefs I've built it in side tag f39-build-side-65890. I plan
to update it in both Rawhide and Fedora 38 this week.
HTH.
--
Zamir SUN
GPG : 1D86 6D4A 49CE 4BBD 72CF FCF5 D856 6E11 F2A0 525E
Want to know more about Fedora?
Visit https://fedoraproject.org/wiki/
Ready to contribute? See https://whatcanidoforfedora.org/
想了解更多中文资讯,访问 https://zh.fedoracommunity.org/
On 4/5/23 18:25, Jerome Marchand wrote:
> On 05/04/2023 12:03, Zamir SUN wrote:
>> Hi,
>>
>> I'm working on libtraceevent and libtracefs update. There will be
>> soname bump happening to them. Namely,
>>
>> libtraceevent.so 1.6.3 -> 1.7.2
>> libtracefs.so 1.5.0 -> 1.6.4
>>
>> IIRC only kernel-tools (for perf and rtla) and trace-cmd depends on
>> them. So I'm also copying their corresponding contacts.
>
> I imagine you implicitly included kernelshark in trace-cmd, but it's his
> own package now.
Hi Jerome,
Ah right, by trace-cmd I do really also mean kernelshark as well.
> There is also rasdaemon
Thanks for double check! Luckily I tried rasdaemon and it seems it is
still working fine with this update.
>
> # dnf --enablerepo '*' repoquery --whatrequires libtraceevent
> Last metadata expiration check: 0:00:35 ago on Wed 05 Apr 2023 12:18:21
> PM CEST.
> kernelshark-1:2.1.1-2.fc38.x86_64
> libtracecmd-0:1.2.0-3.fc39.x86_64
> libtraceevent-devel-0:1.6.3-2.fc38.i686
> libtraceevent-devel-0:1.6.3-2.fc38.x86_64
> libtracefs-0:1.5.0-2.fc38.i686
> libtracefs-0:1.5.0-2.fc38.x86_64
> perf-0:6.3.0-0.rc5.git0.1.fc39.x86_64
> python3-perf-0:6.3.0-0.rc5.git0.1.fc39.x86_64
> rasdaemon-0:0.8.0-1.fc39.x86_64
> rtla-0:6.3.0-0.rc5.git0.1.fc39.x86_64
> trace-cmd-0:3.1.4-3.fc39.x86_64
> trace-cmd-python3-0:3.1.4-3.fc39.x86_64
> [root@jmarchan-f37 ~]# dnf --enablerepo '*' repoquery --whatrequires
> libtracefs
> Last metadata expiration check: 0:00:45 ago on Wed 05 Apr 2023 12:18:21
> PM CEST.
> kernelshark-1:2.1.1-2.fc38.x86_64
> libtracecmd-0:1.2.0-3.fc39.x86_64
> libtracefs-devel-0:1.5.0-2.fc38.i686
> libtracefs-devel-0:1.5.0-2.fc38.x86_64
> rtla-0:6.3.0-0.rc5.git0.1.fc39.x86_64
> trace-cmd-0:3.1.4-3.fc39.x86_64
> trace-cmd-python3-0:3.1.4-3.fc39.x86_64
>
>>
>> As for libtraceevent, I've tried running trace-cmd/perf/rtla with the
>> new version and they still works. So I've updated it in Rawhide,
>> Fedora 38 and Fedora 37. They are now in Bodhi.
>>
>> As for libtracefs I've built it in side tag f39-build-side-65890. I
>> plan to update it in both Rawhide and Fedora 38 this week.
>
> Sounds good.
>
> Jerome
>
>>
>> HTH.
>>
>
--
Zamir SUN
GPG : 1D86 6D4A 49CE 4BBD 72CF FCF5 D856 6E11 F2A0 525E
Want to know more about Fedora?
Visit https://fedoraproject.org/wiki/
Ready to contribute? See https://whatcanidoforfedora.org/
想了解更多中文资讯,访问 https://zh.fedoracommunity.org/
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: 99606177
You can find all the details about the test run at
https://datawarehouse.cki-project.org/kcidb/checkouts/83940
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 - NFS Connectathon
ppc64le - NFS Connectathon
s390x - NFS Connectathon
Issue: avc: denied { name_bind } for pid=897864 comm="rpcbind" src=63924 scontext=system_u:system_r:rpcbind_t:s0 tcontext=system_u:object_r:unreserved_port_t:s0 tclass=udp_socket permissive=1
URL: https://bugzilla.redhat.com/show_bug.cgi?id=1983604#c3
Affected tests:
x86_64 - xfstests - nfsv4.2
Issue: (kernel-fedora) Storage - blktests - nvmeof-mp: FAIL: Configured NVMe target driver
URL: https://gitlab.com/redhat/centos-stream/tests/kernel/kernel-tests/-/issues/…
Affected tests:
ppc64le - Storage - blktests - nvmeof-mp
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
`-'
______________________________________________________________________________
From: Prarit Bhargava on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2173
Most of the kernel and its packing is currently xz. There is one
exception, KABI. Remove gzip change the KABI symbol compression to xz.
There are other compression algorithms that are becoming more popular. To
prepare for this change, add a compression variable and compression file
extension variable.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
---
redhat/kernel.spec.template | 35 ++++++++++++++---------------------
1 files changed, 14 insertions(+), 21 deletions(-)
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/kernel.spec.template: Suppress 'extracting debug info' noise in build log
debugedit's find_debuginfo.sh script has been modified with a '-q' flag to
suppress the 'extracting debug info' messages in RPM logs. On a fedora
kernel build these messages account for 61% of the log [1]
Fedora's debugedit has been updated with the -q change in all supported
releases [2] so suppress the messages by adding -q.
[1] https://kojipkgs.fedoraproject.org//packages/kernel/6.2.0/0.rc5.20230123git…
[2] https://src.fedoraproject.org/rpms/debugedit
Signed-off-by: Prarit Bhargava <prarit(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
@@ -678,7 +678,12 @@ BuildConflicts: dwarves < 1.13
%undefine _unique_debug_srcs
%undefine _debugsource_packages
%undefine _debuginfo_subpackages
+
+%if 0%{?fedora}
+%global _find_debuginfo_opts -r -q
+%else
%global _find_debuginfo_opts -r
+%endif
%global _missing_build_ids_terminate_build 1
%global _no_recompute_build_ids 1
%endif
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2357
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/kernel.spec.template: Fix kernel-tools-libs-devel dependency
'stan' reported that they could not install the kernel-tools-libs-devel
package due to a missing 'kernel-libs' package that does not exist.
ark commit 571cc844b533 ("kernel.spec: use %{package_name} also for tools subpackages")
accidentally stripped off 'tools' in a line.
Fix this kernel-tools-libs-devel dependency.
Signed-off-by: Prarit Bhargava <prarit(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
@@ -1061,7 +1061,7 @@ Requires: %{package_name}-tools = %{version}-%{release}
Provides: cpupowerutils-devel = 1:009-0.6.p1
Obsoletes: cpupowerutils-devel < 1:009-0.6.p1
%endif
-Requires: %{package_name}-libs = %{version}-%{release}
+Requires: %{package_name}-tools-libs = %{version}-%{release}
Provides: %{package_name}-tools-devel
%description -n %{package_name}-tools-libs-devel
This package contains the development files for the tools/ directory from
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2396
From: Patrick Talbert <ptalbert(a)redhat.com>
redhat: fix the check for the n option
The current logic is testing for the letter n anywhere in
the MAKEFLAGS. Instead we should just check the firstword
as described in the make docs section 7.3.
Signed-off-by: Patrick Talbert <ptalbert(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -13,7 +13,7 @@ SPECRELEASED_KERNEL=$(RELEASED_KERNEL)
SPECINCLUDE_FEDORA_FILES=$(INCLUDE_FEDORA_FILES)
SPECINCLUDE_RHEL_FILES=$(INCLUDE_RHEL_FILES)
-ifneq (,$(findstring n,$(MAKEFLAGS)))
+ifneq (,$(findstring n,$(firstword -$(MAKEFLAGS))))
# Do not set RHTEST on the command line. Use the make command built-in options
# -n, --just-print, --dry-run, --recon on the command line.
RHTEST=1
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2395