From 3dcc8971ab3162ec4888ccd37c338e0ac274b511 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sun, 18 Sep 2011 13:42:43 +0200 Subject: [PATCH] it's the little things that mean a lot --- kernel_inpbuilder.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/kernel_inpbuilder.py b/kernel_inpbuilder.py index c2fd632..76d85e6 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', '--append_to_version', - '~%s' %(revision), '--initrd', 'kernel_debug', + '%s' %(revision), '--initrd', 'kernel_debug', 'kernel_image', 'kernel_source', 'kernel_headers', 'modules'] logger.info('start compile process') @@ -246,14 +246,14 @@ def add_local_version_to_config(kernel_build_revision): ) kernel_config = read_file(KERNEL_CONFIG_PATH) # don't put the branch names into the packages names - if GIT_BRANCH_NAME[7:] == 'master-': - flavour = GIT_BRANCH_NAME[:7] - elif GIT_BRANCH_NAME[8:] == 'develop-': - flavour = GIT_BRANCH_NAME[:8] - elif GIT_BRANCH_NAME[8:] == 'release-': - flavour = GIT_BRANCH_NAME[:8] - elif GIT_BRANCH_NAME[7:] == 'hotfix-': - flavour = GIT_BRANCH_NAME[:7] + if GIT_BRANCH_NAME[:7] == 'master-': + flavour = GIT_BRANCH_NAME[7:] + elif GIT_BRANCH_NAME[:8] == 'develop-': + flavour = GIT_BRANCH_NAME[8:] + elif GIT_BRANCH_NAME[:8] == 'release-': + flavour = GIT_BRANCH_NAME[8:] + elif GIT_BRANCH_NAME[:7] == 'hotfix-': + flavour = GIT_BRANCH_NAME[7:] else: logger.error('GIT_BRANCH_NAME is %s' % GIT_BRANCH_NAME) flavour = 'none' -- 2.39.5