[Bf-blender-cvs] [14de0d6a5d2] master: Buildbot: Fix pack stage for CentOS based builder
Sergey Sharybin
noreply at git.blender.org
Wed Jun 26 19:35:26 CEST 2019
Commit: 14de0d6a5d299f6e6f4d55f05c264df023259c82
Author: Sergey Sharybin
Date: Wed Jun 26 19:35:10 2019 +0200
Branches: master
https://developer.blender.org/rB14de0d6a5d299f6e6f4d55f05c264df023259c82
Buildbot: Fix pack stage for CentOS based builder
===================================================================
M build_files/buildbot/slave_pack.py
===================================================================
diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py
index 2eaf9c23601..16888008b67 100644
--- a/build_files/buildbot/slave_pack.py
+++ b/build_files/buildbot/slave_pack.py
@@ -135,24 +135,28 @@ if builder.find('cmake') != -1:
blender_version = "%d.%d" % (blender_version // 100, blender_version % 100)
blender_hash = parse_header_file(buildinfo_h, 'BUILD_HASH')[1:-1]
blender_glibc = builder.split('_')[1]
-
- if builder.endswith('x86_64_cmake'):
- chroot_name = 'buildbot_jessie_x86_64'
- bits = 64
- blender_arch = 'x86_64'
- elif builder.endswith('i686_cmake'):
- chroot_name = 'buildbot_jessie_i686'
- bits = 32
- blender_arch = 'i686'
+ command_prefix = []
+
+ if blender_glibc == 'glibc224':
+ if builder.endswith('x86_64_cmake'):
+ chroot_name = 'buildbot_stretch_x86_64'
+ bits = 64
+ blender_arch = 'x86_64'
+ elif builder.endswith('i686_cmake'):
+ chroot_name = 'buildbot_stretch_i686'
+ bits = 32
+ blender_arch = 'i686'
+ command_prefix = ['schroot', '-c', chroot_name, '--']
+ elif blender_glibc == 'glibc217':
+ command_prefix = ['scl', 'enable', 'devtoolset-6', '--']
# Strip all unused symbols from the binaries
print("Stripping binaries...")
- chroot_prefix = ['schroot', '-c', chroot_name, '--']
- subprocess.call(chroot_prefix + ['strip', '--strip-all', blender])
+ subprocess.call(command_prefix + ['strip', '--strip-all', blender])
print("Stripping python...")
py_target = os.path.join(install_dir, blender_version)
- subprocess.call(chroot_prefix + ['find', py_target, '-iname', '*.so', '-exec', 'strip', '-s', '{}', ';'])
+ subprocess.call(command_prefix + ['find', py_target, '-iname', '*.so', '-exec', 'strip', '-s', '{}', ';'])
# Copy all specific files which are too specific to be copied by
# the CMake rules themselves
More information about the Bf-blender-cvs
mailing list