From: stephen soltesz <soltesz@cs.princeton.edu>
Date: Mon, 25 Jun 2012 13:43:45 +0000 (-0400)
Subject: changed mlab tag to 131-2 and removed extra 'mlab' in kernel version string
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a6e6651447ada5812b1047f4158c99561e23672d;p=linux-2.6.git

changed mlab tag to 131-2 and removed extra 'mlab' in kernel version string
---

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index bfe28be5f..3ef9325cd 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -10,7 +10,8 @@ URL: %{SCMURL}
 
 %define name linux-2.6
 %define module_version_varname sublevel
-%define taglevel 888
+# 131 borrowed from centos6.1, -2 second mlab revision
+%define taglevel 131-2
 
 %define sublevel 32
 
@@ -232,7 +233,9 @@ Summary: The Linux kernel
 %define pkg_release %{distro_build}%{?dist}%{?buildid}
 %endif
 #### Planet-Lab ####
-%define pkg_release %{taglevel}%{?pldistro:.%{pldistro}}.mlab%{?date:.%{date}}
+#%define pkg_release %{taglevel}%{?pldistro:.%{pldistro}}.mlab%{?date:.%{date}}
+# this branch is now unique to the mlab build. so pldistro==mlab
+%define pkg_release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 #### Planet-Lab ####
 %define KVERREL %{rpmversion}-%{pkg_release}.%{_target_cpu}