X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=madwifi.spec;h=7e5122ec450f9a62beac669d88611dec1c4e4db2;hb=59b13c918e8b1c67fb7e5208ad3c42e272a7cea9;hp=137833f777cdb01dcbd03029d3f70b5ab9d625fc;hpb=c34075e8fba51072217902b4e73f38efcf3bcc4f;p=madwifi.git

diff --git a/madwifi.spec b/madwifi.spec
index 137833f..7e5122e 100644
--- a/madwifi.spec
+++ b/madwifi.spec
@@ -9,14 +9,32 @@
 
 %define name madwifi
 %define version 4132
-%define taglevel 2
+%define taglevel 5
 
 %define actual_name %{name}-trunk-r%{version}-20100921
 
+# when no planetlab kernel is being built, kernel_version is defined but empty
+%define _with_planetlab_kernel %{?kernel_version:1}%{!?kernel_version:0}
 # we need to make sure that this rpm gets upgraded when the kernel release changes
+%if %{_with_planetlab_kernel}
+# with the planetlab kernel
 %define pl_kernel_taglevel %( echo %{kernel_release} | cut -d. -f1 )
-
-%define release %{kernel_version}.%{pl_kernel_taglevel}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define madwifi_release %{kernel_version}.%{pl_kernel_taglevel}
+%else
+# with the stock kernel
+# this line below
+#%define madwifi_release %( rpm -q --qf "%{version}" kernel-headers )
+# causes recursive macro definition no matter how much you quote
+%define percent %
+%define braop \{
+%define bracl \}
+%define kernel_version %( rpm -q --qf %{percent}%{braop}version%{bracl} kernel-headers )
+%define kernel_release %( rpm -q --qf %{percent}%{braop}release%{bracl} kernel-headers )
+%define kernel_arch %( rpm -q --qf %{percent}%{braop}arch%{bracl} kernel-headers )
+%define madwifi_release %{kernel_version}.%{kernel_release}
+%endif
+
+%define release %{madwifi_release}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
 # 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}
@@ -26,7 +44,7 @@
 # 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_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
@@ -44,6 +62,7 @@ Packager: PlanetLab <devel@planet-lab.org>
 Distribution: PlanetLab %{plrelease}
 URL: %{SCMURL}
 
+Requires: kernel = %{kernel_version}-%{kernel_release}
 Requires: coreutils
 
 %description
@@ -130,6 +149,15 @@ if [ $1 -eq 0 ] ; then
 fi
 
 %changelog
+* Mon Jan 30 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - madwifi-4132-5
+- search third-party in dual location
+
+* Mon Oct 24 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - madwifi-4132-4
+- for building against k32 on f8
+
+* 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