From da0fb5e4fc7747e96b5cf5925c7582ac6345b984 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 7 Dec 2010 12:23:05 +0000 Subject: [PATCH] guess conventions for either <=k27 or >=k32 --- madwifi.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/madwifi.spec b/madwifi.spec index 585808d..bb85961 100644 --- a/madwifi.spec +++ b/madwifi.spec @@ -18,8 +18,12 @@ %define actual_name %{name}-trunk-r%{version}-20100921 %define release %{kernel_version}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} -%define kernel_id_arch %{kernel_version}-%{kernel_release}-%{kernel_arch} -%define kernel_id %{kernel_version}-%{kernel_release} +# use any of these two if found +%define kernelpath_dash /usr/src/kernels/%{kernel_version}-%{kernel_release}-%{kernel_arch} +%define kernelpath_dot /usr/src/kernels/%{kernel_version}-%{kernel_release}.%{kernel_arch} +# the k32 kernel currently builds e.g. /lib/modules/2.6.32-0.onelab.2010.12.07-i686 +# the extra star should address the -i686 part, that k27 does not have +%define kernel_id %{kernel_version}-%{kernel_release}* Summary: madwifi Atheros driver Name: %{name} @@ -48,7 +52,8 @@ madwifi is a new generation driver for the Atheros chipset rm -rf $RPM_BUILD_ROOT # with the new build, we use the kernel-devel rpm for building -%define kernelpath /usr/src/kernels/%{kernel_id_arch} +# guess which convention is used; k27 and before used dash, k32 uses dot +%define kernelpath %( [ -d %{kernelpath_dot} ] && echo %{kernelpath_dot} || echo %{kernelpath_dash} ) %__make KERNELPATH=%kernelpath clean %__make KERNELPATH=%kernelpath -- 2.43.0