Skip to content

Commit

Permalink
zfs-kmod: fix empty rpm requires/conflicts
Browse files Browse the repository at this point in the history
Fix an error in zfs-kmod.spec that causes kmod-zfs packages not to
include the correct RPM requires/conflicts relationships.  With this
change applied, RPM correctly no longer allows kmod-zfs & zfs-dkms
packages to be installed together.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Todd Seidelmann <[email protected]>
Closes #16121
  • Loading branch information
seidelma authored Apr 23, 2024
1 parent 4036b8d commit 87d81d1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion rpm/redhat/zfs-kmod.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# by generating a preamble text file which kmodtool can append to the spec file.
%(/bin/echo -e "\
Requires: @PACKAGE@ = %{version}\n\
Conflicts: @PACKAGE@-dkms)
Conflicts: @PACKAGE@-dkms" > %{_sourcedir}/kmod-preamble)

# LDFLAGS are not sanitized by arch/*/Makefile for these architectures.
%ifarch ppc ppc64 ppc64le aarch64
Expand Down

0 comments on commit 87d81d1

Please sign in to comment.