kernel-srpm-macros.spec: move macros for SRPM generation to kernel-srpm-macros

redhat-rpm-macros has broken kmod SRPM generation when stopped providing
in the base buildroot by moving macros.kmp to kernel-rpm-macros
and not depending on the latter due to superficial reasons.  Since
it depends on kernel-srpm-macros now, we can fix that breakage.

Resolves: #2002887
Signed-off-by: Eugene Syromiatnikov <esyr@redhat.com>
This commit is contained in:
Eugene Syromiatnikov 2021-11-18 14:49:46 +01:00
parent 4c68fd7e56
commit e607db68c7

View File

@ -97,11 +97,13 @@ install -p -m 644 -t "%{buildroot}%{_fileattrsdir}" modalias.attr
%files %files
%{_rpmconfigdir}/macros.d/macros.kernel-srpm %{_rpmconfigdir}/macros.d/macros.kernel-srpm
%{_rpmconfigdir}/macros.d/macros.kmp
%{_fileattrsdir}/kmod.attr %{_fileattrsdir}/kmod.attr
%{rrcdir}/kmodtool
%{rrcdir}/rpmsort
%files -n kernel-rpm-macros %files -n kernel-rpm-macros
%{_rpmconfigdir}/kabi.sh %{_rpmconfigdir}/kabi.sh
%{_rpmconfigdir}/macros.d/macros.kmp
%{_fileattrsdir}/kabi.attr %{_fileattrsdir}/kabi.attr
%{_fileattrsdir}/modalias.attr %{_fileattrsdir}/modalias.attr
%{_fileattrsdir}/provided_ksyms.attr %{_fileattrsdir}/provided_ksyms.attr
@ -109,8 +111,6 @@ install -p -m 644 -t "%{buildroot}%{_fileattrsdir}" modalias.attr
%dir %{rrcdir}/find-provides.d %dir %{rrcdir}/find-provides.d
%{rrcdir}/brp-kmod-restore-perms %{rrcdir}/brp-kmod-restore-perms
%{rrcdir}/brp-kmod-set-exec-bit %{rrcdir}/brp-kmod-set-exec-bit
%{rrcdir}/kmodtool
%{rrcdir}/rpmsort
%{rrcdir}/symset-table %{rrcdir}/symset-table
%{rrcdir}/find-provides.ksyms %{rrcdir}/find-provides.ksyms
%{rrcdir}/find-requires.ksyms %{rrcdir}/find-requires.ksyms