[xtables-addons-kmod] Fix module path for fedora < 33 and el
commit 48e8b984f9d0d325ca551699f52143bf016a0b1c
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Oct 28 20:44:19 2020 +0000
Fix module path for fedora < 33 and el
xtables-addons-kmod.spec | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/xtables-addons-kmod.spec b/xtables-addons-kmod.spec
index e0e6e8f..8321481 100644
--- a/xtables-addons-kmod.spec
+++ b/xtables-addons-kmod.spec
@@ -11,7 +11,7 @@
Name: xtables-addons-kmod
Summary: Kernel module (kmod) for xtables-addons
Version: 3.11
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2
URL: https://inai.de/projects/xtables-addons/
Source0: https://inai.de/files/xtables-addons/xtables-addons-%{version}.tar.xz
@@ -48,18 +48,29 @@ done
%build
for kernel_version in %{?kernel_versions} ; do
export XA_ABSTOPSRCDIR=${PWD}/_kmod_build_${kernel_version%%___*}
- make %{?_smp_mflags} V=1 -C "${kernel_version##*___}"
M=${PWD}/_kmod_build_${kernel_version%%___*}/extensions modules
+ make %{?_smp_mflags} V=1 -C "${kernel_version##*___}" \
+ M=${PWD}/_kmod_build_${kernel_version%%___*}/extensions modules
done
%install
for kernel_version in %{?kernel_versions} ; do
export XA_ABSTOPSRCDIR=${PWD}/_kmod_build_${kernel_version%%___*}
- make %{?_smp_mflags} V=1 -C "${kernel_version##*___}"
M=${PWD}/_kmod_build_${kernel_version%%___*}/extensions _emodinst_
INSTALL_MOD_PATH=%{buildroot} ext-mod-dir=%{kmodinstdir_postfix}
+ make %{?_smp_mflags} V=1 -C "${kernel_version##*___}" \
+ M=${PWD}/_kmod_build_${kernel_version%%___*}/extensions _emodinst_ \
+%if 0%{?fedora} < 33 || 0%{?rhel}
+ INSTALL_MOD_PATH=%{buildroot}%{_prefix} \
+%else
+ INSTALL_MOD_PATH=%{buildroot} \
+%endif
+ ext-mod-dir=%{kmodinstdir_postfix}
done
%{?akmod_install}
%changelog
+* Wed Oct 28 2020 Leigh Scott <leigh123linux(a)gmail.com> - 3.11-2
+- Fix module path for fedora < 33 and el
+
* Wed Oct 28 2020 Leigh Scott <leigh123linux(a)gmail.com> - 3.11-1
- Release 3.11