Skip to content

Commit

Permalink
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-m…
Browse files Browse the repository at this point in the history
…odule
  • Loading branch information
behlendorf committed Nov 24, 2009
2 parents 27bda60 + 9441b7e commit b2db102
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions zfs-modules.spec.in
Expand Up @@ -66,8 +66,8 @@
%endif
%else

# CHAOS 4.x:
%if %{defined ch4}
# CHAOS 4.x/5.x:
%if %{defined ch4} || %{defined ch5}
%if %{undefined kver}
%define klnk %{_usrsrc}/kernels/*/include/config
%define kver %((echo X; %{__cat} %{klnk}/kernel.release
Expand All @@ -85,8 +85,8 @@
%endif
%else

# RHEL 5:
%if %{defined el5}
# RHEL 5.x/6.x:
%if %{defined el5} || %{defined el6}
%if %{undefined kver}
%define klnk %{_usrsrc}/kernels/*/include/config
%define kver %((echo X; %{__cat} %{klnk}/kernel.release
Expand Down

0 comments on commit b2db102

Please sign in to comment.