zfs-patches/0052-Fix-zfs-kmod-builds-when-using-rpm-4.14.patch

   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:52:37 +0100
   4 Subject: [PATCH] Fix zfs-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 #7284
  18 (cherry picked from commit dc0176eeec9719827610fc68742ea3c76796a81f)
  19 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  20 ---
  21  config/zfs-build.m4 | 2 ++
  22  1 file changed, 2 insertions(+)
  23
  24 diff --git a/config/zfs-build.m4 b/config/zfs-build.m4
  25 index 7c19cecd6..8fc3863f4 100644
  26 --- a/config/zfs-build.m4
  27 +++ b/config/zfs-build.m4
  28 @@ -162,6 +162,8 @@ AC_DEFUN([ZFS_AC_RPM], [
  29         RPM_DEFINE_COMMON='--define "$(DEBUG_ZFS) 1"'
  30         RPM_DEFINE_UTIL='--define "_dracutdir $(dracutdir)" --define "_udevdir $(udevdir)" --define "_udevruledir $(udevruledir)" --define "_initconfdir $(DEFAULT_INITCONF_DIR)" $(DEFINE_INITRAMFS) $(DEFINE_SYSTEMD)'
  31         RPM_DEFINE_KMOD='--define "kernels $(LINUX_VERSION)" --define "require_spldir $(SPL)" --define "require_splobj $(SPL_OBJ)" --define "ksrc $(LINUX)" --define "kobj $(LINUX_OBJ)"'
  32 +       RPM_DEFINE_KMOD+=' --define "_wrong_version_format_terminate_build 0"'
  33 +
  34         RPM_DEFINE_DKMS=
  35
  36         dnl # Override default lib directory on Debian/Ubuntu systems.  The provided
  37 --
  38 2.14.2
  39