From: Holger Levsen <holger@layer-acht.org>
Date: Sun, 18 Sep 2011 12:44:09 +0000 (+0200)
Subject: revision must not contain hyphens
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=e7204f364128694a3eec0535d7a60f418da14c1d;p=profitbricks%2Fjenkins-build-scripts.git

revision must not contain hyphens
---

diff --git a/kernel_inpbuilder.py b/kernel_inpbuilder.py
index 75fcf6a..cff9bf2 100644
--- a/kernel_inpbuilder.py
+++ b/kernel_inpbuilder.py
@@ -204,7 +204,7 @@ def build_kernel(version, revision, parallel_jobs='auto', distcc=False):
 
     cmd = [MAKE_KPKG, '-j', '%s' %(parallel_jobs), '--arch',
             '%s' %(BUILD_ARCH), '--rootcmd', 'fakeroot', '--revision',
-            '3.x-%s' %(version), '--initrd', 'kernel_debug',
+            '3.x+%s' %(version), '--initrd', 'kernel_debug',
             'kernel_image', 'kernel_source', 'kernel_headers', 'modules']
 
     logger.info('start compile process for version %s revision %s' % (version, revision))
@@ -258,7 +258,7 @@ def add_local_version_to_config(kernel_build_revision):
         logger.error('GIT_BRANCH_NAME is %s, flavour is none.' % GIT_BRANCH_NAME)
         flavour = 'none'
 
-    localversion = '-profitbricks-%s' % flavour
+    localversion = 'profitbricks+%s' % flavour
     for lino, line in kernel_config.iteritems():
         try:
             key, value = CREG_KERNEL_CONFIG_DELIM.split(line)