Stripping and packaging shall happen inside of chroot as well
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 10 Jan 2013 09:21:12 +0000 (09:21 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 10 Jan 2013 09:21:12 +0000 (09:21 +0000)
build_files/buildbot/slave_pack.py

index 285307a7af9afabf60b19fbb09b5e7c009a86892..3d4f423be9cc51d49f4d72b9f85ecb3b4e8f7488 100644 (file)
@@ -59,9 +59,11 @@ if builder.find('scons') != -1:
 
         if builder.endswith('linux_glibc211_x86_64_scons'):
             config = 'user-config-glibc211-x86_64.py'
 
         if builder.endswith('linux_glibc211_x86_64_scons'):
             config = 'user-config-glibc211-x86_64.py'
+            chroot_name = 'buildbot_squeeze_x86_64'
             bits = 64
         elif builder.endswith('linux_glibc211_i386_scons'):
             config = 'user-config-glibc211-i686.py'
             bits = 64
         elif builder.endswith('linux_glibc211_i386_scons'):
             config = 'user-config-glibc211-i686.py'
+            chroot_name = 'buildbot_squeeze_i686'
             bits = 32
 
         if config is not None:
             bits = 32
 
         if config is not None:
@@ -70,7 +72,7 @@ if builder.find('scons') != -1:
 
         blender = os.path.join(install_dir, 'blender')
         blenderplayer = os.path.join(install_dir, 'blenderplayer')
 
         blender = os.path.join(install_dir, 'blender')
         blenderplayer = os.path.join(install_dir, 'blenderplayer')
-        subprocess.call(['strip', '--strip-all', blender, blenderplayer])
+        subprocess.call(['schroot', '-c', chroot_name, '--', 'strip', '--strip-all', blender, blenderplayer])
 
         extra = '/' + os.path.join('home', 'sources', 'release-builder', 'extra')
         mesalibs = os.path.join(extra, 'mesalibs' + str(bits) + '.tar.bz2')
 
         extra = '/' + os.path.join('home', 'sources', 'release-builder', 'extra')
         mesalibs = os.path.join(extra, 'mesalibs' + str(bits) + '.tar.bz2')
@@ -80,7 +82,7 @@ if builder.find('scons') != -1:
         os.system('cp %s %s' % (software_gl, install_dir))
         os.system('chmod 755 %s' % (os.path.join(install_dir, 'blender-softwaregl')))
 
         os.system('cp %s %s' % (software_gl, install_dir))
         os.system('chmod 755 %s' % (os.path.join(install_dir, 'blender-softwaregl')))
 
-        retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
+        retcode = subprocess.call(['schroot', '-c', chroot_name, '--', 'python', 'scons/scons.py'] + scons_options)
 
         sys.exit(retcode)
     else:
 
         sys.exit(retcode)
     else: