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. Drop it.
Fixes: ab2b9b44d5f2 ("redhat: introduce modules-extra-matched meta package")
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
@@ -1472,11 +1472,11 @@ Requires: %{package_name}%{?1:-%{1}}-core = %{specrpmversion}-%{release}\
This meta package is used to install matching core and devel packages for a given %{?2:%{2} }kernel.\
%{nil}
-%define kernel_modules_extra_matched_package(m) \
-%package modules-extra-matched\
-Summary: Meta package which requires modules-extra to be installed for all kernels.\
-%description modules-extra-matched\
-This meta package provides a single reference that other packages can Require to have modules-extra installed for all kernels.\
+%define kernel_modules_extra_matched_package() \
+%package %{?1:%{1}-}modules-extra-matched\
+Summary: Meta package which requires %{?1:%{1}-}modules-extra to be installed for all kernels.\
+%description %{?1:%{1}-}modules-extra-matched\
+This meta package provides a single reference that other packages can Require to have %{?1:%{1}-}modules-extra installed for all kernels.\
%{nil}
#
@@ -1612,6 +1612,7 @@ Requires: kernel-%{?1:%{1}-}-modules-core-uname-r = %{KVERREL}%{uname_variant %{
%{expand:%%kernel_modules_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}} %{-m:%{-m}}}\
%{expand:%%kernel_modules_core_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}} %{-m:%{-m}}}\
%{expand:%%kernel_modules_extra_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}} %{-m:%{-m}}}\
+%{expand:%%kernel_modules_extra_matched_package %{?1:%{1}}}\
%if %{-m:0}%{!-m:1}\
%{expand:%%kernel_modules_internal_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}}}\
%if 0%{!?fedora:1}\
@@ -1861,8 +1862,6 @@ Prebuilt 64k unified kernel image for virtual machines.
Prebuilt 64k unified kernel image addons for virtual machines.
%endif
-%kernel_modules_extra_matched_package
-
%define log_msg() \
{ set +x; } 2>/dev/null \
_log_msglineno=$(grep -n %{*} %{_specdir}/${RPM_PACKAGE_NAME}.spec | grep log_msg | cut -d":" -f1) \
@@ -4190,6 +4189,7 @@ fi\
/usr/src/kernels/%{KVERREL}%{?3:+%{3}}\
%{expand:%%files %{?3:%{3}-}devel-matched}\
%{expand:%%files -f kernel-%{?3:%{3}-}modules-extra.list %{?3:%{3}-}modules-extra}\
+%files %{?3:%{3}-}modules-extra-matched\
%{expand:%%files -f kernel-%{?3:%{3}-}modules-internal.list %{?3:%{3}-}modules-internal}\
%if 0%{!?fedora:1}\
%{expand:%%files -f kernel-%{?3:%{3}-}modules-partner.list %{?3:%{3}-}modules-partner}\
@@ -4276,7 +4276,6 @@ fi\
%kernel_variant_files %{_use_vdso} %{with_debug} rt-64k-debug
%endif
-%files modules-extra-matched
# 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
