Merge branch 'blender-v2.82-release'

build_files/buildbot/buildbot_utils.py

@@ -24,6 +24,14 @@ import re
 import subprocess
 import sys
 
+def is_tool(name):
+    """Check whether `name` is on PATH and marked as executable."""
+
+    # from whichcraft import which
+    from shutil import which
+
+    return which(name) is not None
+
 class Builder:
     def __init__(self, name, branch):
         self.name = name
@@ -42,7 +50,10 @@ class Builder:
             self.command_prefix =  []
         elif name.startswith('linux'):
             self.platform = 'linux'
-            self.command_prefix =  ['scl', 'enable', 'devtoolset-6', '--']
+            if is_tool('scl'):
+                self.command_prefix =  ['scl', 'enable', 'devtoolset-6', '--']
+            else:
+                self.command_prefix =  []
         elif name.startswith('win'):
             self.platform = 'win'
             self.command_prefix =  []

build_files/buildbot/slave_pack.py

@@ -160,8 +160,6 @@ def pack_linux(builder):
     blender_executable = os.path.join(builder.install_dir, 'blender')
 
     info = buildbot_utils.VersionInfo(builder)
-    blender_glibc = builder.name.split('_')[1]
-    blender_arch = 'x86_64'
 
     # Strip all unused symbols from the binaries
     print("Stripping binaries...")
@@ -172,7 +170,7 @@ def pack_linux(builder):
     buildbot_utils.call(builder.command_prefix + ['find', py_target, '-iname', '*.so', '-exec', 'strip', '-s', '{}', ';'])
 
     # Construct package name
-    platform_name = 'linux-' + blender_glibc + '-' + blender_arch
+    platform_name = 'linux64'
     package_name = get_package_name(builder, platform_name)
     package_filename = package_name + ".tar.xz"