From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 7 Dec 2010 14:06:10 +0000 (+0100)
Subject: apply same changes as in madwifi for building against k32
X-Git-Tag: ipfw-0.9-18~1
X-Git-Url: http://git.onelab.eu/?p=ipfw.git;a=commitdiff_plain;h=505f579cb1f1b186c334fc5fe9f90455a41564ba

apply same changes as in madwifi for building against k32
---

diff --git a/planetlab/ipfwroot.spec b/planetlab/ipfwroot.spec
index ef2c98f..2b1823f 100644
--- a/planetlab/ipfwroot.spec
+++ b/planetlab/ipfwroot.spec
@@ -19,8 +19,12 @@
 %define taglevel 17
 
 %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: ipfw and dummynet for Linux
 Name: %{name}
@@ -51,7 +55,8 @@ ipfw is the Linux port of the FreeBSD ipfw and dummynet packages
 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 IPFW_PLANETLAB=1