Skip to content

Commit

Permalink
Fix zfs-kmod builds when using rpm >= 4.14
Browse files Browse the repository at this point in the history
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
  • Loading branch information
loli10K authored and behlendorf committed Mar 9, 2018
1 parent 6b8655a commit c45c6d9
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions config/zfs-build.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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=''
Expand Down

0 comments on commit c45c6d9

Please sign in to comment.