From c34075e8fba51072217902b4e73f38efcf3bcc4f Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 29 Sep 2011 20:21:52 +0200 Subject: [PATCH] imbed kernel taglevel in rpm version number for proper upgrades --- madwifi.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/madwifi.spec b/madwifi.spec index 0bd3275..137833f 100644 --- a/madwifi.spec +++ b/madwifi.spec @@ -3,8 +3,9 @@ # License is GPL. # 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 madwifi %define version 4132 @@ -12,7 +13,10 @@ %define actual_name %{name}-trunk-r%{version}-20100921 -%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} -- 2.43.0