Skip to content

Commit

Permalink
Fix various generic kmod RPM spec issues.
Browse files Browse the repository at this point in the history
There are a number of issues with the generic kmod RPM spec in its
current state:
 - The "%{__id_u}" macro seems to not be available on some systems (e.g.
   Debian squeeze). It appears it has been deprecated. Use "${__id} -u"
   instead.
 - The way the "--with-linux=" configure option is generated in the
   non-RHEL/Fedora case is completely wrong with various newline and
   escaping issues (also, $kernel_version is not available in the
   generator context).

The second issue made the generator shell snippet (almost) silently
fail, which under specific circumstances can result in broken builds
against the wrong kernel sources.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#231
  • Loading branch information
dechamps authored and behlendorf committed Apr 24, 2013
1 parent 352bd19 commit c1b20ce
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions rpm/generic/spl-kmod.spec.in
Expand Up @@ -18,7 +18,7 @@ License: GPLv2+
URL: http://zfsonlinux.org/
Source0: %{module}-%{version}.tar.gz
Source10: kmodtool
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id} -u -n)

# The developments headers will conflict with the dkms packages.
Conflicts: %{module}-dkms
Expand Down Expand Up @@ -106,12 +106,12 @@ for kernel_version in %{?kernel_versions}; do
--with-linux="${kernel_version##*___}" \
--with-linux-obj="${kernel_version##*___}" \
%else
--with-linux=\
%(if [ -e /lib/modules/${kernel_version%%___*}/source ]; then \
echo "/lib/modules/${kernel_version%%___*}/source" \
--with-linux="$( \
if [ -e "/lib/modules/${kernel_version%%___*}/source" ]; then \
echo "/lib/modules/${kernel_version%%___*}/source"; \
else \
echo "/lib/modules/${kernel_version%%___*}/build" \
fi) \
echo "/lib/modules/${kernel_version%%___*}/build"; \
fi)" \
--with-linux-obj="/lib/modules/${kernel_version%%___*}/build" \
%endif
%{debug} \
Expand Down

0 comments on commit c1b20ce

Please sign in to comment.