summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Behlendorf <behlendorf1@llnl.gov>2011-04-08 10:22:42 -0700
committerBrian Behlendorf <behlendorf1@llnl.gov>2011-04-08 10:22:42 -0700
commit0f6fd32927aa2b9c63d1b527824705924a5a21ca (patch)
treec4acf3dc8de3408d4db18f27e4e8c22c762fa2ed
parent38baef530de4961390d5862e29cc1a85a3dcefa3 (diff)
Fix rebuildable RPMs for el6/ch5zfs-0.6.0-rc3
When rebuilding the source RPM under el5 you need to append the target_cpu. However, under el6/ch5 things are packaged correctly and the arch is already part of kver. For this reason it also needs to be stripped from kver when setting kverpkg.
-rw-r--r--zfs-modules.spec.in8
1 files changed, 6 insertions, 2 deletions
diff --git a/zfs-modules.spec.in b/zfs-modules.spec.in
index 8d96696a2..84d1d5280 100644
--- a/zfs-modules.spec.in
+++ b/zfs-modules.spec.in
@@ -94,14 +94,18 @@
%endif
%define kpkg kernel
%define kdevpkg kernel-devel
- %if %{defined el6}
+ %if %{defined el6} || %{defined ch5}
%define kverpkg %(echo %{kver} | %{__sed} -e 's/.%{_target_cpu}//g')
%else
%define kverpkg %{kver}
%endif
%define koppkg =
%if %{undefined kdir}
- %define kdir %{_usrsrc}/kernels/%{kver}-%{_target_cpu}
+ %if %{defined el6} || %{defined ch5}
+ %define kdir %{_usrsrc}/kernels/%{kver}
+ %else
+ %define kdir %{_usrsrc}/kernels/%{kver}-%{_target_cpu}
+ %endif
%endif
%if %{undefined kobj}
%define kobj %{kdir}