X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=madwifi.spec;h=95da4566b797ad76442c260240c57e52aea9bfe7;hb=0c6adf2c9e36b8c87f56a38b2381bfd3c127a647;hp=e7b6aab5ecd797ca9bb476e490b6c66d22c25859;hpb=084cfa0b0d66b0cc20068d1db6a154dd3234f5b4;p=madwifi.git

diff --git a/madwifi.spec b/madwifi.spec
index e7b6aab..95da456 100644
--- a/madwifi.spec
+++ b/madwifi.spec
@@ -1,25 +1,33 @@
-#
-# $Id$
-#
-%define url $URL$
-
 # Marc E. Fiuczynski <mef@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 # License is GPL.
 
 # kernel_release, kernel_version and kernel_arch are expected to be set by the build to e.g.
-# kernel_release : vs2.3.0.29.1.planetlab
-# kernel_version : 2.6.22.14
+# kernel_release : 24.onelab  (24 is then the planetlab taglevel)
+# kernel_version : 2.6.27.57 | 2.6.32  (57 in the 27 case is the patch level)
+# kernel_arch :    i686 | x86_64
 
 %define name madwifi
-%define version 3878
-%define taglevel 0
+%define version 4132
+%define taglevel 3
+
+%define actual_name %{name}-trunk-r%{version}-20100921
+
+# we need to make sure that this rpm gets upgraded when the kernel release changes
+%define pl_kernel_taglevel %( echo %{kernel_release} | cut -d. -f1 )
+
+%define release %{kernel_version}.%{pl_kernel_taglevel}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
-%define actual_name %{name}-trunk-r%{version}-20081204
+# 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} )
 
-%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}
+# 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}.%{kernel_arch}
+%define kernel_id %( [ -d %{kernelpath_dot} ] && echo %{kernel_id_new} || echo %{kernel_id_old} )
 
 Summary: madwifi Atheros driver
 Name: %{name}
@@ -27,14 +35,14 @@ Version: %{version}
 Release: %{release}
 License: GPL
 Group: System Environment/Kernel
-Source0: %{actual_name}.tar.bz2
+Source0: %{actual_name}.tar.gz
 Source1: ifup-pre-local
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 Vendor: MadWifi
 Packager: PlanetLab <devel@planet-lab.org>
 Distribution: PlanetLab %{plrelease}
-URL: %(echo %{url} | cut -d ' ' -f 2)
+URL: %{SCMURL}
 
 Requires: coreutils
 
@@ -47,9 +55,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
 
@@ -92,6 +97,8 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/wlanconfig
 /sbin/ath_info
 /sbin/ifup-pre-local
+/sbin/madwifi-unload
+/sbin/wpakey
 %{_mandir}/man8/80211debug.8*
 %{_mandir}/man8/80211stats.8*
 %{_mandir}/man8/athchans.8*
@@ -123,6 +130,12 @@ if [ $1 -eq 0 ] ; then
 fi
 
 %changelog
+* Sun Oct 02 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - madwifi-4132-3
+- rpm version number has the kernel taglevel embedded
+
+* Sun Jan 23 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - madwifi-4132-2
+- build tweaked for k32
+
 * Thu Oct 02 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - madwifi-0.9.4-2
 - specfile adjustments for 0.9.4