diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-01-10 13:21:12 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-01-10 13:21:12 +0400 |
commit | 53ad8274b00698e8f13ef6c931f057e0afd34661 (patch) | |
tree | 2d9b90f89910e258ee34582ad4fe476fdabf8642 /build_files/buildbot | |
parent | 93c82483c7bf27f2c067c1dd634940b28074244c (diff) |
Stripping and packaging shall happen inside of chroot as well
Diffstat (limited to 'build_files/buildbot')
-rw-r--r-- | build_files/buildbot/slave_pack.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py index 285307a7af9..3d4f423be9c 100644 --- a/build_files/buildbot/slave_pack.py +++ b/build_files/buildbot/slave_pack.py @@ -59,9 +59,11 @@ if builder.find('scons') != -1: 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' + chroot_name = 'buildbot_squeeze_i686' 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') - 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') @@ -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'))) - 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: |