aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLOLi <[email protected]>2018-03-09 22:52:37 +0100
committerBrian Behlendorf <[email protected]>2018-03-09 13:52:37 -0800
commitc45c6d921293084f9b2ecedfef4965fa726f8c07 (patch)
treed43ced8e7715b52a379781ef53964958716f8f43
parent6b8655ad3fe070089b690b95d8485e41b3e7e67e (diff)
Fix zfs-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 #7284
-rw-r--r--config/zfs-build.m41
1 files changed, 1 insertions, 0 deletions
diff --git a/config/zfs-build.m4 b/config/zfs-build.m4
index 603dad36d..e6c386e82 100644
--- a/config/zfs-build.m4
+++ b/config/zfs-build.m4
@@ -210,6 +210,7 @@ AC_DEFUN([ZFS_AC_RPM], [
RPM_DEFINE_KMOD+=' --define "require_splobj $(SPL_OBJ)"'
RPM_DEFINE_KMOD+=' --define "ksrc $(LINUX)"'
RPM_DEFINE_KMOD+=' --define "kobj $(LINUX_OBJ)"'
+ RPM_DEFINE_KMOD+=' --define "_wrong_version_format_terminate_build 0"'
RPM_DEFINE_DKMS=''