X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fipfwroot.spec;h=f48c19d303550b0a338c7541fe1c24ea463e8db8;hb=1a1de26cc80cb0bc11cabbb7326c9bdb4800bdb8;hp=ac0bcb4658317475205ca8cdd910dea0240d41f4;hpb=8decbf02f7ef7d85f7673fbb649022bbe80940ee;p=ipfw.git

diff --git a/planetlab/ipfwroot.spec b/planetlab/ipfwroot.spec
index ac0bcb4..f48c19d 100644
--- a/planetlab/ipfwroot.spec
+++ b/planetlab/ipfwroot.spec
@@ -1,24 +1,25 @@
 #
-# $Id: ipfwroot.spec 16174 2009-12-15 13:38:15Z marta $
-#
-# TODO:
-# restart crond
-#
-%define url $URL$
-
 # Marta Carbone <marta.carbone@iet.unipi.it>
 # 2009 - Universita` di Pisa
 # License is BSD.
 
+#
+# xxx: TODO restart crond
+#
+
 # 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 ipfwroot
 %define version 0.9
-%define taglevel 18
+%define taglevel 21
+
+# 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}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define release %{kernel_version}.%{pl_kernel_taglevel}.%{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}
@@ -28,7 +29,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: ipfw and dummynet for Linux
@@ -47,7 +48,7 @@ Vendor: unipi
 Packager: PlanetLab <marta@onelab2.iet.unipi.it>
 # XXX ask 
 Distribution: PlanetLab %{plrelease}
-URL: %(echo %{url} | cut -d ' ' -f 2)
+URL: %{SCMURL}
 
 %description
 ipfw is the Linux port of the FreeBSD ipfw and dummynet packages
@@ -94,6 +95,15 @@ 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