X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fipfwroot.spec;h=40cff6015591a3cdc56378967f9b8dabbb463072;hb=525efe389b7cf649d6243e085abb6c58ec913ace;hp=2b1823f18a6c5b91a0eec391f1bf1a5385b494a7;hpb=505f579cb1f1b186c334fc5fe9f90455a41564ba;p=ipfw.git

diff --git a/planetlab/ipfwroot.spec b/planetlab/ipfwroot.spec
index 2b1823f..40cff60 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,15 +14,20 @@
 
 %define name ipfwroot
 %define version 0.9
-%define taglevel 17
+%define taglevel 21
 
 %define release %{kernel_version}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
-# use any of these two if found
+
+# 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 extra star should address the -i686 part, that k27 does not have
-%define kernel_id %{kernel_version}-%{kernel_release}*
+# 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}
@@ -54,10 +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
-# 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
 
@@ -93,6 +92,18 @@ depmod -a
 /etc/rc.d/init.d/ipfw
 
 %changelog
+* Fri Jun 10 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - ipfw-0.9-21
+- build tweaks for gcc-4.6 on f15
+
+* 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