Skip to content

Commit

Permalink
fix misplaced quotes in kmod-preamble
Browse files Browse the repository at this point in the history
rpm/redhat/zfs-kmod.spec.in has a typo in the shell code that
creates the kmod-preamble file.  This typo results in the
preamble file having the wrong name,

./SOURCES/kmod-preamblenObsoletes

and missing the Obsoletes clause that has become part of the name.

Because the filename is incorrect, the built package does not have
"obsoletes" or "conflicts" set.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Olaf Faaland <faaland1@llnl.gov>
Closes openzfs#11851
  • Loading branch information
ofaaland authored and behlendorf committed Apr 7, 2021
1 parent 0bf91be commit 506ffdf
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions rpm/redhat/zfs-kmod.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ 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\n\n" > %{_sourcedir}/kmod-preamble\n\
Obsoletes: spl-kmod)
Conflicts: @PACKAGE@-dkms\n\
Obsoletes: spl-kmod\n\n" > %{_sourcedir}/kmod-preamble)

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

0 comments on commit 506ffdf

Please sign in to comment.