From: Holger Levsen <holger@layer-acht.org>
Date: Sun, 18 Sep 2011 14:35:28 +0000 (+0200)
Subject: less is sometimes more
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=a18a29d98fda7c3b07b7c2078ac256eb0c46b6b3;p=profitbricks%2Fjenkins-build-scripts.git

less is sometimes more
---

diff --git a/kernel_build.py b/kernel_build.py
index db2c651..2a581c7 100644
--- a/kernel_build.py
+++ b/kernel_build.py
@@ -172,8 +172,7 @@ def remove_git_target_workspace():
     rmpath = '/tmp/%s-build%s' %(BUILD_ID, BUILD_NUMBER)
     if os.path.isdir(rmpath):
         try:
-            pass
-            #shutil.rmtree(rmpath)
+            shutil.rmtree(rmpath)
         except IOError, error:
             logger.debug('Got exception with error code: %s', error.errno)
             if error.errno == 2:
diff --git a/kernel_inpbuilder.py b/kernel_inpbuilder.py
index 9b54aa7..d9affd9 100644
--- a/kernel_inpbuilder.py
+++ b/kernel_inpbuilder.py
@@ -203,8 +203,8 @@ def build_kernel(version, revision, parallel_jobs='auto', distcc=False):
         parallel_jobs = int(parallel_jobs)
 
     cmd = [MAKE_KPKG, '-j', '%s' %(parallel_jobs), '--arch',
-            '%s' %(BUILD_ARCH), '--rootcmd', 'fakeroot', '--revision', '3.0',
-            '--append-to-version', '+%s' %(version), '--initrd', '--arch-in-name', 
+            '%s' %(BUILD_ARCH), '--rootcmd', 'fakeroot',
+            '--initrd', '--arch-in-name', 
             'configure' ]
 
     #'kernel_debug',