diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-27 15:09:12 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-27 15:09:36 +0300 |
commit | 3fcd638bebafbdc58bda0a0b83efb7b61cfdf850 (patch) | |
tree | 08a1efdede8e9a5766d21b45ee7093d071858a70 /build_files/buildbot/slave_compile.py | |
parent | 79c8eed8432a96d9142715e46fe70e28721d614f (diff) |
Buildbot: Support build in a newer chroot
Diffstat (limited to 'build_files/buildbot/slave_compile.py')
-rw-r--r-- | build_files/buildbot/slave_compile.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 6508e8e1bbb..34774c30c1d 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -84,16 +84,22 @@ if 'cmake' in builder: cmake_options.append(['-G', '"Visual Studio 12 2013"']) elif builder.startswith('linux'): + tokens = builder.split("_") + glibc = tokens[1] + if glibc == 'glibc219': + deb_name = "jessie" + elif glibc == 'glibc211': + deb_name = "squeeze" remove_install_dir = True cmake_config_file = "build_files/buildbot/config/blender_linux.cmake" cmake_player_config_file = "build_files/buildbot/config/blender_linux_player.cmake" if builder.endswith('x86_64_cmake'): - chroot_name = 'buildbot_squeeze_x86_64' + chroot_name = 'buildbot_' + deb_name + '_x86_64' targets = ['player', 'blender'] elif builder.endswith('i386_cmake'): bits = 32 - chroot_name = 'buildbot_squeeze_i686' - cuda_chroot_name = 'buildbot_squeeze_x86_64' + chroot_name = 'buildbot_' + deb_name + '_i686' + cuda_chroot_name = 'buildbot_' + deb_name + '_x86_64' targets = ['player', 'blender', 'cuda'] cmake_options.append("-C" + os.path.join(blender_dir, cmake_config_file)) |