]> granicus.if.org Git - zfs/commitdiff
Fix zfs-kmod builds when using rpm >= 4.14
authorLOLi <loli10K@users.noreply.github.com>
Fri, 9 Mar 2018 21:52:37 +0000 (22:52 +0100)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 9 Mar 2018 21:52:37 +0000 (13:52 -0800)
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 <behlendorf1@llnl.gov>
Signed-off-by: loli10K <ezomori.nozomu@gmail.com>
Closes #7284

config/zfs-build.m4

index 603dad36d0d712bf2cc2381b7d31c74d884bd496..e6c386e821238dd9167aff636c689ac26995ae04 100644 (file)
@@ -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=''