Skip to content

Commit 4caf611

Browse files
author
Herton R. Krzesinski
committed
Merge: kernel.spec: move modules.builtin to kernel-core
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/2087 kernel.spec: move modules.builtin to kernel-core Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2172376 Upstream Status: RHEL only RPM provides are generated (also) from modules.builtin. kernel-modules-core currently list also Provides for all builting modules, which is wrong, since these are provided by kernel-core. Move modules.builtin to kernel-core package. Signed-off-by: Jan Stancek <jstancek@redhat.com> Approved-by: Herton R. Krzesinski <herton@redhat.com> Approved-by: Jarod Wilson <jarod@redhat.com> Approved-by: Patrick Talbert <ptalbert@redhat.com> Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
2 parents 0abae3a + f998aa3 commit 4caf611

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

redhat/kernel.spec.template

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3346,6 +3346,7 @@ fi
33463346
%ghost %attr(0600, root, root) /boot/System.map-%{KVERREL}%{?3:+%{3}}\
33473347
/lib/modules/%{KVERREL}%{?3:+%{3}}/symvers.gz\
33483348
/lib/modules/%{KVERREL}%{?3:+%{3}}/config\
3349+
/lib/modules/%{KVERREL}%{?3:+%{3}}/modules.builtin*\
33493350
%ghost %attr(0600, root, root) /boot/symvers-%{KVERREL}%{?3:+%{3}}.gz\
33503351
%ghost %attr(0600, root, root) /boot/initramfs-%{KVERREL}%{?3:+%{3}}.img\
33513352
%ghost %attr(0644, root, root) /boot/config-%{KVERREL}%{?3:+%{3}}\
@@ -3362,7 +3363,11 @@ fi
33623363
%if %{1}\
33633364
/lib/modules/%{KVERREL}%{?3:+%{3}}/vdso\
33643365
%endif\
3365-
/lib/modules/%{KVERREL}%{?3:+%{3}}/modules.*\
3366+
/lib/modules/%{KVERREL}%{?3:+%{3}}/modules.block\
3367+
/lib/modules/%{KVERREL}%{?3:+%{3}}/modules.drm\
3368+
/lib/modules/%{KVERREL}%{?3:+%{3}}/modules.modesetting\
3369+
/lib/modules/%{KVERREL}%{?3:+%{3}}/modules.networking\
3370+
/lib/modules/%{KVERREL}%{?3:+%{3}}/modules.order\
33663371
%{expand:%%files -f kernel-%{?3:%{3}-}modules.list %{?3:%{3}-}modules}\
33673372
%{expand:%%files %{?3:%{3}-}devel}\
33683373
%defverify(not mtime)\

0 commit comments

Comments
 (0)