From: Vitaly Kuznetsov vkuznets@redhat.com
Include the information about builtin symbols into kernel-uki-virt package too
The information about builtin symbols: symvers, modules.builtin, System.map, config and the auto generated RPM "Provides" may be required by e.g. proprietary kernel modules and there's no reason why these can't be used with UKI. Include the information to kernel-uki-virt package in parallel with kernel-core so both these packages can be used to resolve the dependency if needed.
Signed-off-by: Vitaly Kuznetsov vkuznets@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 @@ -3360,6 +3360,10 @@ fi %endif\ %if %{with_efiuki}\ %{expand:%%files %{?3:%{3}-}uki-virt}\ +%attr(0600, root, root) /lib/modules/%{KVERREL}%{?3:+%{3}}/System.map\ +/lib/modules/%{KVERREL}%{?3:+%{3}}/symvers.gz\ +/lib/modules/%{KVERREL}%{?3:+%{3}}/config\ +/lib/modules/%{KVERREL}%{?3:+%{3}}/modules.builtin*\ /lib/modules/%{KVERREL}%{?3:+%{3}}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-virt.efi\ %ghost /%{image_install_path}/efi/EFI/Linux/%{?-k:%{-k*}}%{!?-k:*}-%{KVERREL}%{?3:+%{3}}.efi\ %endif\
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2408
From: Vitaly Kuznetsov on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2408#note_1365997...
@jmflinuxtx @jstancek @hertonrk-rh please review! In particular, I'm not sure what the downsides of packaging System.map/ config/symvers/modules.builtin to **both** kernel-core and kernel-uki-virt might be. I've checked that these two packages can be installed in parallel without issues but there might be other implications of the added Provides I'm missing. Thanks!
From: Jan Stancek on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2408#note_1366597...
That was question I had too, when I saw the patch. But per https://docs.fedoraproject.org/en-US/packaging- guidelines/#_file_and_directory_ownership it is allowed, and your tests were OK.
Do you have a koji/brew build link? I'm curious what new provides are there in uki now? Is it only kmod() and kernel()? Anything else?
From: Vitaly Kuznetsov on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2408#note_1366660...
Yes, here's the koji build https://koji.fedoraproject.org/koji/taskinfo?taskID=100339642 My understanding is that we only get a bunch of kmod() and kernel() Provides: added (same as in kernel-core).
From: Vitaly Kuznetsov on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2408#note_1392054...
Just a humble ping @jmflinuxtx @jstancek @hertonrk-rh
From: Justin M. Forbes on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2408#note_1392108...
I believe it is okay, as the file is identical in both cases. I am also of the impression that you CAN install the packages in parallel, but in practice most people will not.
From: Vitaly Kuznetsov on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2408#note_1392220...
OK, worst case scenario we can introduce a new package with these files which is going to be required by both kernel-core and kernel-uki-virt ("kernel- builtin-info") but I'd really like to not do this without a good reason.
From: Justin M. Forbes on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2408#note_1396389...
This is incorrect, with !2173 we switched to using a compression variable, and are currently using xz not gz.
It should be:
/lib/modules/%{KVERREL}%{?3:+%{3}}/symvers.%compext\
From: Vitaly Kuznetsov on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2408#note_1399257...
I see you've already fixed that:
``` commit b8eb5c3d6bce1fe1b6d5d4bbe4ee81b140f90f93 Author: Justin M. Forbes jforbes@fedoraproject.org Date: Thu May 18 12:46:33 2023 -0500
Fix file listing for symvers in uki ```
thanks!
kernel@lists.fedoraproject.org