From b43a44923523ce1cc3ab55ab08a6ac580f3477fe Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sun, 18 Sep 2011 13:05:58 +0200 Subject: [PATCH] dont put the full git branch name into the packages names, just the flavor part --- kernel_inpbuilder.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/kernel_inpbuilder.py b/kernel_inpbuilder.py index 7e73799..417fcea 100644 --- a/kernel_inpbuilder.py +++ b/kernel_inpbuilder.py @@ -204,7 +204,7 @@ def build_kernel(revision, parallel_jobs='auto', distcc=False): cmd = [MAKE_KPKG, '-j', '%s' %(parallel_jobs), '--arch', '%s' %(BUILD_ARCH), '--rootcmd', 'fakeroot', '--revision', - '%s' %(revision), '--initrd', '--arch_in_name', 'kernel_debug', + '%s' %(revision), '--initrd', 'kernel_debug', 'kernel_image', 'kernel_source', 'kernel_headers', 'modules'] logger.info('start compile process') @@ -245,7 +245,17 @@ def add_local_version_to_config(kernel_build_revision): 'No config file found at %s' %(KERNEL_CONFIG_PATH) ) kernel_config = read_file(KERNEL_CONFIG_PATH) - localversion = '-%s-%s' %(GIT_BRANCH_NAME, BUILD_ARCH) + # don't put the branch names into the packages names + if GIT_BRANCH_NAME[7:] == 'master-' + flavor=GIT_BRANCH_NAME[:7] + elif GIT_BRANCH_NAME[8:] == 'develop-' + flavor=GIT_BRANCH_NAME[:8] + elif GIT_BRANCH_NAME[8:] == 'release-' + flavor=GIT_BRANCH_NAME[:8] + elif GIT_BRANCH_NAME[7:] == 'hotfix-' + flavor=GIT_BRANCH_NAME[:7] + + localversion = '-profitbricks-%s' %(flavor) for lino, line in kernel_config.iteritems(): try: key, value = CREG_KERNEL_CONFIG_DELIM.split(line) -- 2.39.5