From e607db68c7b9dfd596e00b2aef95a275e28d1fdf Mon Sep 17 00:00:00 2001 From: Eugene Syromiatnikov Date: Thu, 18 Nov 2021 14:49:46 +0100 Subject: [PATCH] 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 --- kernel-srpm-macros.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel-srpm-macros.spec b/kernel-srpm-macros.spec index 20e1ee8..5a58d20 100644 --- a/kernel-srpm-macros.spec +++ b/kernel-srpm-macros.spec @@ -97,11 +97,13 @@ install -p -m 644 -t "%{buildroot}%{_fileattrsdir}" modalias.attr %files %{_rpmconfigdir}/macros.d/macros.kernel-srpm +%{_rpmconfigdir}/macros.d/macros.kmp %{_fileattrsdir}/kmod.attr +%{rrcdir}/kmodtool +%{rrcdir}/rpmsort %files -n kernel-rpm-macros %{_rpmconfigdir}/kabi.sh -%{_rpmconfigdir}/macros.d/macros.kmp %{_fileattrsdir}/kabi.attr %{_fileattrsdir}/modalias.attr %{_fileattrsdir}/provided_ksyms.attr @@ -109,8 +111,6 @@ install -p -m 644 -t "%{buildroot}%{_fileattrsdir}" modalias.attr %dir %{rrcdir}/find-provides.d %{rrcdir}/brp-kmod-restore-perms %{rrcdir}/brp-kmod-set-exec-bit -%{rrcdir}/kmodtool -%{rrcdir}/rpmsort %{rrcdir}/symset-table %{rrcdir}/find-provides.ksyms %{rrcdir}/find-requires.ksyms