X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=madwifi.spec;h=5c6066ec132e07d57571d7626b39615002ea3d93;hb=3fa8a134b6e8192b6062d39bc6848a9d3b901a51;hp=585808d48f5c80945ea2ba01f70242da47b263ce;hpb=1c64ff52a10831d4fd98f1a996d8e80cbaa19c0c;p=madwifi.git

diff --git a/madwifi.spec b/madwifi.spec
index 585808d..5c6066e 100644
--- a/madwifi.spec
+++ b/madwifi.spec
@@ -13,13 +13,22 @@
 
 %define name madwifi
 %define version 4132
-%define taglevel 0
+%define taglevel 1
 
 %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}
+
+# guess which convention is used; k27 and before used dash, k32 uses dot
+%define kernelpath_dash /usr/src/kernels/%{kernel_version}-%{kernel_release}-%{kernel_arch}
+%define kernelpath_dot /usr/src/kernels/%{kernel_version}-%{kernel_release}.%{kernel_arch}
+%define kernelpath %( [ -d %{kernelpath_dot} ] && echo %{kernelpath_dot} || echo %{kernelpath_dash} )
+
+# the k32 kernel currently builds e.g. /lib/modules/2.6.32-0.onelab.2010.12.07-i686
+# the k27 and before does not have the -i686 part
+%define kernel_id_old %{kernel_version}-%{kernel_release}
+%define kernel_id_new %{kernel_version}-%{kernel_release}-%{_target_cpu}
+%define kernel_id %( [ -d %{kernelpath_dot} ] && echo %{kernel_id_new} || echo %{kernel_id_old} )
 
 Summary: madwifi Atheros driver
 Name: %{name}
@@ -47,9 +56,6 @@ madwifi is a new generation driver for the Atheros chipset
 %build
 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}
-
 %__make KERNELPATH=%kernelpath clean
 %__make KERNELPATH=%kernelpath