diff options
| author | Etienne Dechamps <[email protected]> | 2013-04-21 19:54:29 +0100 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2013-04-24 16:17:57 -0700 |
| commit | c1b20ce32084fa946f446400a66c4b606d7649d7 (patch) | |
| tree | ad4ac77af994362ad4d597e7d76dc8f532fc0dfa | |
| parent | 352bd194827fc0b6425bf701b095969f9fb80b4f (diff) | |
Fix various generic kmod RPM spec issues.
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 <[email protected]>
Closes #231
| -rw-r--r-- | rpm/generic/spl-kmod.spec.in | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/rpm/generic/spl-kmod.spec.in b/rpm/generic/spl-kmod.spec.in index 224660be0..01918699a 100644 --- a/rpm/generic/spl-kmod.spec.in +++ b/rpm/generic/spl-kmod.spec.in @@ -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 @@ -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} \ |