summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorAndy Whitcroft <apw@canonical.com>2010-06-10 09:48:54 +0100
committerLeann Ogasawara <leann.ogasawara@canonical.com>2010-08-20 15:59:54 -0700
commit58dd25d393d191f5a219843655a718c36b4de81d (patch)
tree91f457e22dcc76984b12650a8da243c2ca4ea745 /debian
parentcda15a097181980d4e5ad563afa85e9a3b838810 (diff)
UBUNTU: debian -- ensure the version number is clean
As of v2.6.35-rc2 the kernel version generator sometimes appends a '+' to the overall version number based on the current state of the SCM. Forcibly override the version handling for this version. Signed-off-by: Andy Whitcroft <apw@canonical.com>
Diffstat (limited to 'debian')
-rw-r--r--debian/rules.d/0-common-vars.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
index befef2792c63..eec7ada96b21 100644
--- a/debian/rules.d/0-common-vars.mk
+++ b/debian/rules.d/0-common-vars.mk
@@ -165,7 +165,8 @@ conc_level = -j$(CONCURRENCY_LEVEL)
kmake = make ARCH=$(build_arch) \
EXTRAVERSION=-$(abinum)-$(target_flavour) \
CONFIG_DEBUG_SECTION_MISMATCH=y SUBLEVEL=$(SUBLEVEL) \
- KBUILD_BUILD_VERSION="$(uploadnum)"
+ KBUILD_BUILD_VERSION="$(uploadnum)" \
+ LOCALVERSION= localver-extra=
ifneq ($(LOCAL_ENV_CC),)
kmake += CC=$(LOCAL_ENV_CC) DISTCC_HOSTS=$(LOCAL_ENV_DISTCC_HOSTS)
endif