From c45c6d921293084f9b2ecedfef4965fa726f8c07 Mon Sep 17 00:00:00 2001 From: LOLi Date: Fri, 9 Mar 2018 22:52:37 +0100 Subject: [PATCH] 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 Signed-off-by: loli10K Closes #7284 --- config/zfs-build.m4 | 1 + 1 file changed, 1 insertion(+) diff --git a/config/zfs-build.m4 b/config/zfs-build.m4 index 603dad36d0..e6c386e821 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=''