]> git.proxmox.com Git - mirror_spl.git/commitdiff
Fix spl-kmod builds when using rpm >= 4.14
authorLOLi <loli10K@users.noreply.github.com>
Fri, 9 Mar 2018 21:51:31 +0000 (22:51 +0100)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 9 Mar 2018 21:51:31 +0000 (13:51 -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 #691

config/spl-build.m4

index 553b5d51b67b9539b21274f9c5b934e218cfdb80..9c97e64f910b56a0f1cee472f0c99ee934defbd9 100644 (file)
@@ -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"'