From: Thierry Parmentelat Date: Thu, 29 Sep 2011 14:43:51 +0000 (+0200) Subject: add kernel taglevel in rpm number - need to upgrade together with the kernel X-Git-Tag: ipfw-0.9-22~1 X-Git-Url: http://git.onelab.eu/?p=ipfw.git;a=commitdiff_plain;h=ed17a75baba88df23e65300bb2b8b6f670c2856f add kernel taglevel in rpm number - need to upgrade together with the kernel --- diff --git a/planetlab/ipfwroot.spec b/planetlab/ipfwroot.spec index 40cff60..dac5e82 100644 --- a/planetlab/ipfwroot.spec +++ b/planetlab/ipfwroot.spec @@ -1,22 +1,25 @@ # -# TODO: -# restart crond -# -%define url $URL$ - # Marta Carbone # 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 21 -%define release %{kernel_version}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} +# 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}.%{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} @@ -45,7 +48,7 @@ Vendor: unipi Packager: PlanetLab # 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