Skip to content

Commit 5129dc9

Browse files
committed
Merge: redhat/kernel.spec: drop modules-extra-matched for noarch
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1018 JIRA: https://issues.redhat.com/browse/RHEL-95740 Upstream Status: RHEL only (ARK) commit 931d0f810859a9e799f967b287bf8930564292d1 Author: Jan Stancek <jstancek@redhat.com> Date: Tue Jun 10 15:29:53 2025 -0400 redhat/kernel.spec: drop modules-extra-matched for noarch We build also modules-extra-matched for noarch, which isn't necessary and creates some confusion (for composes). So, drop it for noarch. Fixes: ab2b9b44d5f2 ("redhat: introduce modules-extra-matched meta package") Signed-off-by: Jan Stancek <jstancek@redhat.com> Signed-off-by: Jan Stancek <jstancek@redhat.com> Approved-by: Scott Weaver <scweaver@redhat.com> Approved-by: Patrick Talbert <ptalbert@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Julio Faracco <jfaracco@redhat.com>
2 parents b2ced56 + 032c928 commit 5129dc9

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

redhat/kernel.spec.template

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1828,7 +1828,9 @@ Prebuilt 64k unified kernel image for virtual machines.
18281828
Prebuilt 64k unified kernel image addons for virtual machines.
18291829
%endif
18301830

1831+
%ifnarch noarch %{nobuildarches}
18311832
%kernel_modules_extra_matched_package
1833+
%endif
18321834

18331835
%define log_msg() \
18341836
{ set +x; } 2>/dev/null \
@@ -4258,7 +4260,9 @@ fi\
42584260
%kernel_variant_files %{_use_vdso} %{with_debug} rt-64k-debug
42594261
%endif
42604262

4263+
%ifnarch noarch %{nobuildarches}
42614264
%files modules-extra-matched
4265+
%endif
42624266

42634267
# plz don't put in a version string unless you're going to tag
42644268
# and build.

0 commit comments

Comments
 (0)