]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
less is sometimes more
authorHolger Levsen <holger@layer-acht.org>
Sun, 18 Sep 2011 14:35:28 +0000 (16:35 +0200)
committerHolger Levsen <holger@layer-acht.org>
Sun, 18 Sep 2011 14:35:28 +0000 (16:35 +0200)
kernel_build.py
kernel_inpbuilder.py

index db2c6513c321ff5a092ab03431f024c5da997f3a..2a581c7be00cebf2bcb3978a440fde16b37697f5 100644 (file)
@@ -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:
index 9b54aa7b8df120777dc519b70f3a738c4996f1ad..d9affd9da728fa18e95501f233c0cc19b1ad2cf4 100644 (file)
@@ -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',