summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLOLi <[email protected]>2018-03-09 22:51:31 +0100
committerBrian Behlendorf <[email protected]>2018-03-09 13:51:31 -0800
commit43983eb2024ec6b3280e6e06a6fb621ee3bb2a41 (patch)
treed4634b30cb00c9638cfb7aed9c9b5f27d6ccc908
parent3673d032850c3b54b8b2cc74cf1782a75cc9b2a9 (diff)
Fix spl-kmod builds when using rpm >= 4.14
With rpm-software-management/rpm@5e94633 a package version containing invalid characters (most commonly a double '-') causes the kmod package generation to terminate with an error. This change takes advantage of the newly introduced rpm macro "_wrong_version_format_terminate_build" to allow kmod packages to be built. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: loli10K <[email protected]> Closes #691
-rw-r--r--config/spl-build.m41
1 files changed, 1 insertions, 0 deletions
diff --git a/config/spl-build.m4 b/config/spl-build.m4
index 553b5d51b..9c97e64f9 100644
--- a/config/spl-build.m4
+++ b/config/spl-build.m4
@@ -231,6 +231,7 @@ AC_DEFUN([SPL_AC_RPM], [
RPM_DEFINE_COMMON='--define "$(DEBUG_SPL) 1" --define "$(DEBUG_KMEM) 1" --define "$(DEBUG_KMEM_TRACKING) 1"'
RPM_DEFINE_UTIL=
RPM_DEFINE_KMOD='--define "kernels $(LINUX_VERSION)"'
+ RPM_DEFINE_KMOD+=' --define "_wrong_version_format_terminate_build 0"'
RPM_DEFINE_DKMS=
SRPM_DEFINE_COMMON='--define "build_src_rpm 1"'