[OS-BUILD PATCHv2] redhat/kernel.spec: drop modules-extra-matched for noarch

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Jan Stancek <jstancek@xxxxxxxxxx>

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@xxxxxxxxxx>

Signed-off-by: Jan Stancek <jstancek@xxxxxxxxxx>

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
@@ -1861,7 +1861,9 @@ Prebuilt 64k unified kernel image for virtual machines.
 Prebuilt 64k unified kernel image addons for virtual machines.
 %endif
 
+%ifnarch noarch %{nobuildarches}
 %kernel_modules_extra_matched_package
+%endif
 
 %define log_msg() \
 	{ set +x; } 2>/dev/null \
@@ -4276,7 +4278,9 @@ fi\
 %kernel_variant_files %{_use_vdso} %{with_debug} rt-64k-debug
 %endif
 
+%ifnarch noarch %{nobuildarches}
 %files modules-extra-matched
+%endif
 
 # plz don't put in a version string unless you're going to tag
 # and build.

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3939

-- 
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue




[Index of Archives]     [Fedora General Discussion]     [Older Fedora Users Archive]     [Fedora Advisory Board]     [Fedora Security]     [Fedora Devel Java]     [Fedora Legacy]     [Fedora Desktop]     [ATA RAID]     [Fedora Marketing]     [Fedora Mentors]     [Fedora Package Announce]     [Fedora Package Review]     [Fedora Music]     [Fedora Packaging]     [Centos]     [Fedora SELinux]     [Coolkey]     [Yum Users]     [Tux]     [Yosemite News]     [KDE Users]     [Fedora Art]     [Fedora Docs]     [USB]     [Asterisk PBX]

  Powered by Linux