projects / zfsonlinux.git / blame
| Commit | Line | Data |
|---|---|---|
| edf5051c FG |
1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| 2 | From: LOLi <loli10K@users.noreply.github.com> | |
| 3 | Date: Fri, 9 Mar 2018 22:51:31 +0100 | |
| 4 | Subject: [PATCH] Fix spl-kmod builds when using rpm >= 4.14 | |
| 5 | MIME-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ||
| 9 | With rpm-software-management/rpm@5e94633 a package version containing | |
| 10 | invalid characters (most commonly a double '-') causes the kmod package | |
| 11 | generation to terminate with an error. This change takes advantage of | |
| 12 | the newly introduced rpm macro "_wrong_version_format_terminate_build" | |
| 13 | to allow kmod packages to be built. | |
| 14 | ||
| 15 | Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> | |
| 16 | Signed-off-by: loli10K <ezomori.nozomu@gmail.com> | |
| 17 | Closes #691 | |
| 18 | (cherry picked from commit 7d17023a33bb6f064e013dd99862e62b719f1e26) | |
| 19 | Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> | |
| 20 | --- | |
| 21 | config/spl-build.m4 | 1 + | |
| 22 | 1 file changed, 1 insertion(+) | |
| 23 | ||
| 24 | diff --git a/config/spl-build.m4 b/config/spl-build.m4 | |
| 25 | index 553b5d5..9c97e64 100644 | |
| 26 | --- a/config/spl-build.m4 | |
| 27 | +++ b/config/spl-build.m4 | |
| 28 | @@ -231,6 +231,7 @@ AC_DEFUN([SPL_AC_RPM], [ | |
| 29 | RPM_DEFINE_COMMON='--define "$(DEBUG_SPL) 1" --define "$(DEBUG_KMEM) 1" --define "$(DEBUG_KMEM_TRACKING) 1"' | |
| 30 | RPM_DEFINE_UTIL= | |
| 31 | RPM_DEFINE_KMOD='--define "kernels $(LINUX_VERSION)"' | |
| 32 | + RPM_DEFINE_KMOD+=' --define "_wrong_version_format_terminate_build 0"' | |
| 33 | RPM_DEFINE_DKMS= | |
| 34 | ||
| 35 | SRPM_DEFINE_COMMON='--define "build_src_rpm 1"' | |
| 36 | -- | |
| 37 | 2.14.2 | |
| 38 |