X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fipfwroot.spec;h=31a17e26a5709f145d459c0b095b923297c7bf65;hb=4ca93c4f545e2988ac916de4fd22f8e909000a29;hp=8e24d32cd514f88069f156c2cb39f0ff22921a55;hpb=ab891197c3969c496eb7d18798a62c59a8db6bae;p=ipfw.git

diff --git a/planetlab/ipfwroot.spec b/planetlab/ipfwroot.spec
index 8e24d32..31a17e2 100644
--- a/planetlab/ipfwroot.spec
+++ b/planetlab/ipfwroot.spec
@@ -1,6 +1,4 @@
 #
-# $Id: ipfwroot.spec 16174 2009-12-15 13:38:15Z marta $
-#
 # TODO:
 # restart crond
 #
@@ -16,11 +14,20 @@
 
 %define name ipfwroot
 %define version 0.9
-%define taglevel 14
+%define taglevel 20
 
 %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: ipfw and dummynet for Linux
 Name: %{name}
@@ -50,9 +57,6 @@ ipfw is the Linux port of the FreeBSD ipfw and dummynet packages
 # clean the rpm build directory
 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 IPFW_PLANETLAB=1
 
@@ -88,6 +92,24 @@ depmod -a
 /etc/rc.d/init.d/ipfw
 
 %changelog
+* Sun Jan 23 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - ipfw-0.9-20
+- tweaks for compiling on k32/64 bits
+
+* Wed Dec 08 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - ipfw-0.9-19
+- fix detection of kernel conventions
+
+* Tue Dec 07 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - ipfw-0.9-18
+- guess conventions for either <=k27 or >=k32
+
+* Tue Jun 15 2010 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - ipfw-0.9-17
+- testing git only module-tag
+
+* Tue Jun 15 2010 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - ipfw-0.9-16
+- tagging ipfw to test module-tools on (pure) git
+
+* Wed May 12 2010 Talip Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - ipfw-0.9-15
+- tagging for obsoletes
+
 * Tue Apr 27 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - ipfw-0.9-13
 - Update to the ipfw3 version of the dummynet code.