39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: LOLi <loli10K@users.noreply.github.com>
|
|
Date: Fri, 9 Mar 2018 22:51:31 +0100
|
|
Subject: [PATCH] Fix spl-kmod builds when using rpm >= 4.14
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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
|
|
(cherry picked from commit 7d17023a33bb6f064e013dd99862e62b719f1e26)
|
|
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
|
---
|
|
config/spl-build.m4 | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/config/spl-build.m4 b/config/spl-build.m4
|
|
index 553b5d5..9c97e64 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"'
|
|
--
|
|
2.14.2
|
|
|