alibuild 1.15.2__tar.gz → 1.16.0__tar.gz

{alibuild-1.15.2/alibuild.egg-info → alibuild-1.16.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: alibuild
-Version: 1.15.2
+Version: 1.16.0
 Summary: ALICE Build Tool
 Home-page: https://alisw.github.io/alibuild
 Author: Giulio Eulisse
@@ -12,7 +12,6 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
-Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
@@ -26,10 +25,6 @@ Requires-Dist: requests
 Requires-Dist: distro
 Requires-Dist: jinja2
 Requires-Dist: boto3
-Requires-Dist: futures; python_version == "2.7"
-Requires-Dist: futures; python_version == "2.6"
-Requires-Dist: argparse; python_version == "2.6"
-Requires-Dist: ordereddict; python_version == "2.6"
 
 .. image:: https://badge.fury.io/py/alibuild.svg
 .. image:: https://github.com/alisw/alibuild/actions/workflows/pr-check.yml/badge.svg?branch=master&event=push

{alibuild-1.15.2 → alibuild-1.16.0}/alfaBuild

@@ -60,7 +60,7 @@ def doMain(args, parser):
 
   if args.action == "version":
     print("aliBuild version: {version} ({arch})".format(
-      version=__version__, arch=args.architecture or "unknown"))
+      version=__version__ or "unknown", arch=args.architecture or "unknown"))
     sys.exit(0)
 
   if args.action == "doctor":
@@ -91,7 +91,7 @@ if __name__ == "__main__":
   logger.setLevel(logging.DEBUG if args.debug else logging.INFO)
 
   os.environ["ALIBUILD_ANALYTICS_ID"] = "UA-77346950-1"
-  os.environ["ALIBUILD_VERSION"] = __version__
+  os.environ["ALIBUILD_VERSION"] = __version__ or ""
   if args.action == "analytics":
     if args.state == "off":
       disable_analytics()

{alibuild-1.15.2 → alibuild-1.16.0}/aliBuild

@@ -60,7 +60,7 @@ def doMain(args, parser):
 
   if args.action == "version":
     print("aliBuild version: {version} ({arch})".format(
-      version=__version__, arch=args.architecture or "unknown"))
+      version=__version__ or "unknown", arch=args.architecture or "unknown"))
     sys.exit(0)
 
   if args.action == "doctor":
@@ -91,7 +91,7 @@ if __name__ == "__main__":
   logger.setLevel(logging.DEBUG if args.debug else logging.INFO)
 
   os.environ["ALIBUILD_ANALYTICS_ID"] = "UA-77346950-1"
-  os.environ["ALIBUILD_VERSION"] = __version__
+  os.environ["ALIBUILD_VERSION"] = __version__ or ""
   if args.action == "analytics":
     if args.state == "off":
       disable_analytics()

{alibuild-1.15.2 → alibuild-1.16.0/alibuild.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: alibuild
-Version: 1.15.2
+Version: 1.16.0
 Summary: ALICE Build Tool
 Home-page: https://alisw.github.io/alibuild
 Author: Giulio Eulisse
@@ -12,7 +12,6 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
-Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
@@ -26,10 +25,6 @@ Requires-Dist: requests
 Requires-Dist: distro
 Requires-Dist: jinja2
 Requires-Dist: boto3
-Requires-Dist: futures; python_version == "2.7"
-Requires-Dist: futures; python_version == "2.6"
-Requires-Dist: argparse; python_version == "2.6"
-Requires-Dist: ordereddict; python_version == "2.6"
 
 .. image:: https://badge.fury.io/py/alibuild.svg
 .. image:: https://github.com/alisw/alibuild/actions/workflows/pr-check.yml/badge.svg?branch=master&event=push

{alibuild-1.15.2 → alibuild-1.16.0}/alibuild.egg-info/SOURCES.txt

@@ -87,9 +87,9 @@ tests/test_git.py
 tests/test_hashing.py
 tests/test_init.py
 tests/test_log.py
+tests/test_packagelist.py
 tests/test_parseRecipe.py
 tests/test_sync.py
-tests/test_system_replacement.py
 tests/test_utilities.py
 tests/test_workarea.py
 tests/testdist/broken1.sh
@@ -99,4 +99,6 @@ tests/testdist/broken4.sh
 tests/testdist/broken5.sh
 tests/testdist/broken6.sh
 tests/testdist/broken7.sh
-tests/testdist/defaults-o2.sh
+tests/testdist/clobber-initdotsh.sh
+tests/testdist/defaults-o2.sh
+tests/testdist/delete-etc.sh

alibuild-1.16.0/alibuild.egg-info/requires.txt

@@ -0,0 +1,5 @@
+pyyaml
+requests
+distro
+jinja2
+boto3

{alibuild-1.15.2 → alibuild-1.16.0}/alibuild_helpers/__init__.py

@@ -9,13 +9,13 @@ except ImportError:
     try:
         from setuptools_scm import get_version
     except ImportError:
-        __version__ = '(could not detect version)'
+        __version__ = None
     else:
         import os.path
         source_root = os.path.join(os.path.dirname(__file__), os.path.pardir)
         try:
             __version__ = get_version(root=source_root)
         except LookupError:
-            __version__ = '(could not detect version)'
+            __version__ = None
         finally:
             del get_version, source_root

{alibuild-1.15.2 → alibuild-1.16.0}/alibuild_helpers/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.15.2'
-__version_tuple__ = version_tuple = (1, 15, 2)
+__version__ = version = '1.16.0'
+__version_tuple__ = version_tuple = (1, 16, 0)

{alibuild-1.15.2 → alibuild-1.16.0}/alibuild_helpers/args.py

@@ -105,6 +105,12 @@ def doParseArgs():
                                   "same effect as adding 'force_rebuild: true' to its recipe "
                                   "in CONFIGDIR. You can specify this option multiple times or "
                                   "separate multiple arguments with commas."))
+  build_parser.add_argument("--annotate", default=[], action="append", metavar="PACKAGE=COMMENT",
+                            help=("Store COMMENT in the build metadata for PACKAGE. This option "
+                                  "can be given multiple times, if you want to store comments "
+                                  "in multiple packages. The comment will only be stored if "
+                                  "PACKAGE is compiled or downloaded during this run; if it "
+                                  "already exists, this does not happen."))
 
   build_docker = build_parser.add_argument_group(title="Build inside a container", description="""\
   Builds can be done inside a Docker container, to make it easier to get a
@@ -272,6 +278,29 @@ def doParseArgs():
                                    "Passed through verbatim -- separate multiple arguments "
                                    "with spaces, and make sure quoting is correct! Implies --docker."))
 
+  doctor_remote = doctor_parser.add_argument_group(title="Re-use prebuilt tarballs", description="""\
+  Reusing prebuilt tarballs saves compilation time, as common packages need not
+  be rebuilt from scratch. rsync://, https://, b3:// and s3:// remote stores
+  are recognised. Some of these require credentials: s3:// remotes require an
+  ~/.s3cfg; b3:// remotes require AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY
+  environment variables. A useful remote store is
+  'https://s3.cern.ch/swift/v1/alibuild-repo'. It requires no credentials and
+  provides tarballs for the most common supported architectures.
+  """)
+  doctor_remote.add_argument("--no-remote-store", action="store_true",
+                            help="Disable the use of the remote store, even if it is enabled by default.")
+  doctor_remote.add_argument("--remote-store", dest="remoteStore", metavar="STORE", default="", help="""\
+  Where to find prebuilt tarballs to reuse. See above for available remote stores.
+  End with ::rw if you want to upload (in that case, ::rw is stripped and --write-store
+  is set to the same value). Implies --no-system. May be set to a default store on some
+  architectures; use --no-remote-store to disable it in that case.
+  """)
+  doctor_remote.add_argument("--write-store", dest="writeStore", metavar="STORE", default="",
+                            help=("Where to upload newly built packages. Same syntax as --remote-store, "
+                                  "except ::rw is not recognised. Implies --no-system."))
+  doctor_remote.add_argument("--insecure", dest="insecure", action="store_true",
+                            help="Don't validate TLS certificates when connecting to an https:// remote store.")
+
   doctor_dirs = doctor_parser.add_argument_group(title="Customise aliBuild directories")
   doctor_dirs.add_argument("-C", "--chdir", metavar="DIR", dest="chdir", default=DEFAULT_CHDIR,
                            help=("Change to the specified directory before doing anything. "
@@ -355,11 +384,12 @@ On Linux, x86-64:
 On Linux, POWER8 / PPC64 (little endian):
    RHEL7 / CC7 compatible: slc7_ppc64
 
-On Mac, x86-64:
-   Yosemite to Big Sur: osx_x86-64
-   Big Sur: osx_arm64
+On Mac, 1-2 latest supported OSX versions:
+   Intel: osx_x86-64
+   Apple Silicon: osx_arm64
 """
 
+# When updating this variable, also update docs/user.markdown!
 S3_SUPPORTED_ARCHS = "slc7_x86-64", "slc8_x86-64", "ubuntu2004_x86-64", "ubuntu2204_x86-64", "slc9_x86-64"
 
 def finaliseArgs(args, parser):
@@ -410,7 +440,17 @@ def finaliseArgs(args, parser):
     if args.docker and not args.dockerImage:
       args.dockerImage = "registry.cern.ch/alisw/%s-builder" % args.architecture.split("_")[0]
 
-  if args.action == "build":
+  if "annotate" in args:
+    for comment_assignment in args.annotate:
+      if "=" not in comment_assignment:
+        parser.error("--annotate takes arguments of the form PACKAGE=COMMENT")
+    args.annotate = {
+      package: comment
+      for package, _, comment
+      in (assignment.partition("=") for assignment in args.annotate)
+    }
+
+  if args.action in ("build", "doctor"):
     args.configDir = args.configDir
 
     # On selected platforms, caching is active by default

{alibuild-1.15.2 → alibuild-1.16.0}/alibuild_helpers/build.py

@@ -8,7 +8,7 @@ from alibuild_helpers.cmd import execute, getstatusoutput, DockerRunner, BASH, i
 from alibuild_helpers.utilities import prunePaths
 from alibuild_helpers.utilities import resolve_store_path
 from alibuild_helpers.utilities import format, parseDefaults, readDefaults
-from alibuild_helpers.utilities import getPackageList
+from alibuild_helpers.utilities import getPackageList, asList
 from alibuild_helpers.utilities import validateDefaults
 from alibuild_helpers.utilities import Hasher
 from alibuild_helpers.utilities import yamlDump
@@ -33,6 +33,7 @@ except ImportError:
 
 import concurrent.futures
 import importlib
+import json
 import socket
 import os
 import re
@@ -339,6 +340,135 @@ def better_tarball(spec, old, new):
   return old if hashes.index(old_hash) < hashes.index(new_hash) else new
 
 
+def generate_initdotsh(package, specs, architecture, post_build=False):
+  """Return the contents of the given package's etc/profile/init.sh as a string.
+
+  If post_build is true, also generate variables pointing to the package
+  itself; else, only generate variables pointing at it dependencies.
+  """
+  spec = specs[package]
+  # Allow users to override ALIBUILD_ARCH_PREFIX if they manually source
+  # init.sh. This is useful for development off CVMFS, since we have a
+  # slightly different directory hierarchy there.
+  lines = [': "${ALIBUILD_ARCH_PREFIX:=%s}"' % architecture]
+
+  # Generate the part which sources the environment for all the dependencies.
+  # We guarantee that a dependency is always sourced before the parts
+  # depending on it, but we do not guarantee anything for the order in which
+  # unrelated components are activated.
+  # These variables are also required during the build itself, so always
+  # generate them.
+  lines.extend((
+    '[ -n "${{{bigpackage}_REVISION}}" ] || '
+    '. "$WORK_DIR/$ALIBUILD_ARCH_PREFIX"/{package}/{version}-{revision}/etc/profile.d/init.sh'
+  ).format(
+    bigpackage=dep.upper().replace("-", "_"),
+    package=quote(specs[dep]["package"]),
+    version=quote(specs[dep]["version"]),
+    revision=quote(specs[dep]["revision"]),
+  ) for dep in spec.get("requires", ()))
+
+  if post_build:
+    bigpackage = package.upper().replace("-", "_")
+
+    # Set standard variables related to the package itself. These should only
+    # be set once the build has actually completed.
+    lines.extend(line.format(
+      bigpackage=bigpackage,
+      package=quote(spec["package"]),
+      version=quote(spec["version"]),
+      revision=quote(spec["revision"]),
+      hash=quote(spec["hash"]),
+      commit_hash=quote(spec["commit_hash"]),
+    ) for line in (
+      'export {bigpackage}_ROOT="$WORK_DIR/$ALIBUILD_ARCH_PREFIX"/{package}/{version}-{revision}',
+      "export {bigpackage}_VERSION={version}",
+      "export {bigpackage}_REVISION={revision}",
+      "export {bigpackage}_HASH={hash}",
+      "export {bigpackage}_COMMIT={commit_hash}",
+    ))
+
+    # Generate the part which sets the environment variables related to the
+    # package itself. This can be variables set via the "env" keyword in the
+    # metadata or paths which get concatenated via the "{append,prepend}_path"
+    # keys. These should only be set once the build has actually completed,
+    # since the paths referred to will only exist then.
+
+    # First, output a sensible error message if types are wrong.
+    for key in ("env", "append_path", "prepend_path"):
+      dieOnError(not isinstance(spec.get(key, {}), dict),
+                 "Tag `%s' in %s should be a dict." % (key, package))
+
+    # Set "env" variables.
+    # We only put the values in double-quotes, so that they can refer to other
+    # shell variables or do command substitution (e.g. $(brew --prefix ...)).
+    lines.extend('export {}="{}"'.format(key, value)
+                 for key, value in spec.get("env", {}).items()
+                 if key != "DYLD_LIBRARY_PATH")
+
+    # Append paths to variables, if requested using append_path.
+    # Again, only put values in double quotes so that they can refer to other variables.
+    lines.extend('export {key}="${key}:{value}"'
+                 .format(key=key, value=":".join(asList(value)))
+                 for key, value in spec.get("append_path", {}).items()
+                 if key != "DYLD_LIBRARY_PATH")
+
+    # First convert all values to list, so that we can use .setdefault().insert() below.
+    prepend_path = {key: asList(value)
+                    for key, value in spec.get("prepend_path", {}).items()}
+    # By default we add the .../bin directory to PATH and .../lib to LD_LIBRARY_PATH.
+    # Prepend to these paths, so that our packages win against system ones.
+    for key, value in (("PATH", "bin"), ("LD_LIBRARY_PATH", "lib")):
+      prepend_path.setdefault(key, []).insert(0, "${}_ROOT/{}".format(bigpackage, value))
+    lines.extend('export {key}="{value}${{{key}+:${key}}}"'
+                 .format(key=key, value=":".join(value))
+                 for key, value in prepend_path.items()
+                 if key != "DYLD_LIBRARY_PATH")
+
+  # Return string without a trailing newline, since we expect call sites to
+  # append that (and the obvious way to inesrt it into the build tempate is by
+  # putting the "%(initdotsh_*)s" on its own line, which has the same effect).
+  return "\n".join(lines)
+
+
+def create_provenance_info(package, specs, args):
+  """Return a metadata record for storage in the package's install directory."""
+
+  def spec_info(spec):
+    return {
+      "name": spec["package"],
+      "tag": spec.get("tag"),
+      "source": spec.get("source"),
+      "version": spec["version"],
+      "revision": spec["revision"],
+      "hash": spec["hash"],
+    }
+
+  def dependency_list(key):
+    return [spec_info(specs[dep]) for dep in specs[package].get(key, ())]
+
+  return json.dumps({
+    "comment": args.annotate.get(package),
+    "alibuild_version": __version__,
+    "alidist": {
+      "commit": os.environ["ALIBUILD_ALIDIST_HASH"],
+    },
+    "architecture": args.architecture,
+    "defaults": args.defaults,
+    "package": spec_info(specs[package]),
+    "dependencies": {
+      "direct": {
+        "build": dependency_list("build_requires"),
+        "runtime": dependency_list("runtime_requires"),
+      },
+      "recursive": {  # includes direct deps and deps' deps
+        "build": dependency_list("full_build_requires"),
+        "runtime": dependency_list("full_runtime_requires"),
+      },
+    },
+  })
+
+
 def doBuild(args, parser):
   if args.remoteStore.startswith("http"):
     syncHelper = HttpRemoteSync(args.remoteStore, args.architecture, args.workDir, args.insecure)
@@ -399,7 +529,7 @@ def doBuild(args, parser):
   debug("Building for architecture %s", args.architecture)
   debug("Number of parallel builds: %d", args.jobs)
   debug("Using aliBuild from alibuild@%s recipes in alidist@%s",
-        __version__, os.environ["ALIBUILD_ALIDIST_HASH"])
+        __version__ or "unknown", os.environ["ALIBUILD_ALIDIST_HASH"])
 
   install_wrapper_script("git", workDir)
 
@@ -694,13 +824,26 @@ def doBuild(args, parser):
     # Decide how it should be called, based on the hash and what is already
     # available.
     debug("Checking for packages already built.")
-    linksGlob = format("%(w)s/TARS/%(a)s/%(p)s/%(p)s-%(v)s-*.%(a)s.tar.gz",
-                       w=workDir,
-                       a=args.architecture,
-                       p=spec["package"],
-                       v=spec["version"])
-    debug("Glob pattern used: %s", linksGlob)
-    packages = glob(linksGlob)
+
+    # Make sure this regex broadly matches the regex below that parses the
+    # symlink's target. Overly-broadly matching the version, for example, can
+    # lead to false positives that trigger a warning below.
+    links_regex = re.compile(r"{package}-{version}-(?:local)?[0-9]+\.{arch}\.tar\.gz".format(
+      package=re.escape(spec["package"]),
+      version=re.escape(spec["version"]),
+      arch=re.escape(args.architecture),
+    ))
+    symlink_dir = join(workDir, "TARS", args.architecture, spec["package"])
+    try:
+      packages = [join(symlink_dir, symlink)
+                  for symlink in os.listdir(symlink_dir)
+                  if links_regex.fullmatch(symlink)]
+    except OSError as exc:
+      # If symlink_dir does not exist or cannot be accessed, return an empty
+      # list of packages.
+      packages = []
+    del links_regex, symlink_dir
+
     # In case there is no installed software, revision is 1
     # If there is already an installed package:
     # - Remove it if we do not know its hash
@@ -927,81 +1070,6 @@ def doBuild(args, parser):
       debug("Found tarball in %s" % spec["cachedTarball"]
             if spec["cachedTarball"] else "No cache tarballs found")
 
-    # Generate the part which sources the environment for all the dependencies.
-    # Notice that we guarantee that a dependency is always sourced before the
-    # parts depending on it, but we do not guaranteed anything for the order in
-    # which unrelated components are activated.
-    dependencies = "ALIBUILD_ARCH_PREFIX=\"${ALIBUILD_ARCH_PREFIX:-%s}\"\n" % args.architecture
-    dependenciesInit = "echo ALIBUILD_ARCH_PREFIX=\"\${ALIBUILD_ARCH_PREFIX:-%s}\" >> $INSTALLROOT/etc/profile.d/init.sh\n" % args.architecture
-    for dep in spec.get("requires", []):
-      depSpec = specs[dep]
-      depInfo = {
-        "architecture": args.architecture,
-        "package": dep,
-        "version": depSpec["version"],
-        "revision": depSpec["revision"],
-        "bigpackage": dep.upper().replace("-", "_")
-      }
-      dependencies += format("[ -z ${%(bigpackage)s_REVISION+x} ] && source \"$WORK_DIR/$ALIBUILD_ARCH_PREFIX/%(package)s/%(version)s-%(revision)s/etc/profile.d/init.sh\"\n",
-                             **depInfo)
-      dependenciesInit += format('echo [ -z \${%(bigpackage)s_REVISION+x} ] \&\& source \${WORK_DIR}/\${ALIBUILD_ARCH_PREFIX}/%(package)s/%(version)s-%(revision)s/etc/profile.d/init.sh >> \"$INSTALLROOT/etc/profile.d/init.sh\"\n',
-                             **depInfo)
-    dependenciesDict = {}
-    for dep in spec.get("full_requires", []):
-      depSpec = specs[dep]
-      depInfo = {
-        "architecture": args.architecture,
-        "package": dep,
-        "version": depSpec["version"],
-        "revision": depSpec["revision"],
-        "hash": depSpec["hash"]
-      }
-      dependenciesDict[dep] = depInfo
-    dependenciesJSON = str(dependenciesDict)
-      
-    # Generate the part which creates the environment for the package.
-    # This can be either variable set via the "env" keyword in the metadata
-    # or paths which get appended via the "append_path" one.
-    # By default we append LD_LIBRARY_PATH, PATH
-    environment = ""
-    dieOnError(not isinstance(spec.get("env", {}), dict),
-               "Tag `env' in %s should be a dict." % p)
-    for key,value in spec.get("env", {}).items():
-      if key == "DYLD_LIBRARY_PATH":
-        continue
-      environment += format("echo 'export %(key)s=\"%(value)s\"' >> $INSTALLROOT/etc/profile.d/init.sh\n",
-                            key=key,
-                            value=value)
-    basePath = "%s_ROOT" % p.upper().replace("-", "_")
-
-    pathDict = spec.get("append_path", {})
-    dieOnError(not isinstance(pathDict, dict),
-               "Tag `append_path' in %s should be a dict." % p)
-    for pathName,pathVal in pathDict.items():
-      pathVal = isinstance(pathVal, list) and pathVal or [ pathVal ]
-      if pathName == "DYLD_LIBRARY_PATH":
-        continue
-      environment += format("\ncat << \EOF >> \"$INSTALLROOT/etc/profile.d/init.sh\"\nexport %(key)s=$%(key)s:%(value)s\nEOF",
-                            key=pathName,
-                            value=":".join(pathVal))
-
-    # Same thing, but prepending the results so that they win against system ones.
-    defaultPrependPaths = { "LD_LIBRARY_PATH": "$%s/lib" % basePath,
-                            "PATH": "$%s/bin" % basePath }
-    pathDict = spec.get("prepend_path", {})
-    dieOnError(not isinstance(pathDict, dict),
-               "Tag `prepend_path' in %s should be a dict." % p)
-    for pathName,pathVal in pathDict.items():
-      pathDict[pathName] = isinstance(pathVal, list) and pathVal or [ pathVal ]
-    for pathName,pathVal in defaultPrependPaths.items():
-      pathDict[pathName] = [ pathVal ] + pathDict.get(pathName, [])
-    for pathName,pathVal in pathDict.items():
-      if pathName == "DYLD_LIBRARY_PATH":
-        continue
-      environment += format("\ncat << \EOF >> \"$INSTALLROOT/etc/profile.d/init.sh\"\nexport %(key)s=%(value)s${%(key)s+:$%(key)s}\nEOF",
-                            key=pathName,
-                            value=":".join(pathVal))
-
     # The actual build script.
     referenceStatement = ""
     if "reference" in spec:
@@ -1034,33 +1102,29 @@ def doBuild(args, parser):
     else:
       cachedTarball = spec["cachedTarball"]
 
-
-    cmd = format(cmd_raw,
-                 dependencies=dependencies,
-                 dependenciesInit=dependenciesInit,
-                 dependenciesJSON=dependenciesJSON,
-                 develPrefix=develPrefix,
-                 environment=environment,
-                 workDir=workDir,
-                 configDir=abspath(args.configDir),
-                 incremental_recipe=spec.get("incremental_recipe", ":"),
-                 sourceDir=source and (dirname(source) + "/") or "",
-                 sourceName=source and basename(source) or "",
-                 referenceStatement=referenceStatement,
-                 gitOptionsStatement="" if args.docker else
-                   "export GIT_CLONE_SPEEDUP=" + quote(" ".join(clone_speedup_options())),
-                 requires=" ".join(spec["requires"]),
-                 build_requires=" ".join(spec["build_requires"]),
-                 runtime_requires=" ".join(spec["runtime_requires"])
-                )
-
     scriptDir = join(workDir, "SPECS", args.architecture, spec["package"],
                      spec["version"] + "-" + spec["revision"])
 
     err, out = getstatusoutput("mkdir -p %s" % scriptDir)
     dieOnError(err, "Failed to create script dir %s: %s" % (scriptDir, out))
-    writeAll("%s/build.sh" % scriptDir, cmd)
     writeAll("%s/%s.sh" % (scriptDir, spec["package"]), spec["recipe"])
+    writeAll("%s/build.sh" % scriptDir, cmd_raw % {
+      "provenance": create_provenance_info(spec["package"], specs, args),
+      "initdotsh_deps": generate_initdotsh(p, specs, args.architecture, post_build=False),
+      "initdotsh_full": generate_initdotsh(p, specs, args.architecture, post_build=True),
+      "develPrefix": develPrefix,
+      "workDir": workDir,
+      "configDir": abspath(args.configDir),
+      "incremental_recipe": spec.get("incremental_recipe", ":"),
+      "sourceDir": (dirname(source) + "/") if source else "",
+      "sourceName": basename(source) if source else "",
+      "referenceStatement": referenceStatement,
+      "gitOptionsStatement": "" if args.docker else
+      "export GIT_CLONE_SPEEDUP=" + quote(" ".join(clone_speedup_options())),
+      "requires": " ".join(spec["requires"]),
+      "build_requires": " ".join(spec["build_requires"]),
+      "runtime_requires": " ".join(spec["runtime_requires"]),
+    })
 
     banner("Building %s@%s", spec["package"],
            args.develPrefix if "develPrefix" in args and spec["package"] in develPkgs
@@ -1103,7 +1167,7 @@ def doBuild(args, parser):
     # will perform the actual build. Otherwise build as usual using bash.
     if args.docker:
       build_command = (
-        "docker run --rm --network=host --entrypoint= --user $(id -u):$(id -g) "
+        "docker run --rm --entrypoint= --user $(id -u):$(id -g) "
         "-v {workdir}:/sw -v {scriptDir}/build.sh:/build.sh:ro "
         "-e GIT_REFERENCE_OVERRIDE=/mirror -e WORK_DIR_OVERRIDE=/sw "
         "{mirrorVolume} {develVolumes} {additionalEnv} {additionalVolumes} "
@@ -1116,6 +1180,7 @@ def doBuild(args, parser):
         overrideSource="-e SOURCE0_DIR_OVERRIDE=/" if source.startswith("/") else "",
         additionalEnv=" ".join(
           "-e {}={}".format(var, quote(value)) for var, value in buildEnvironment),
+        # Used e.g. by O2DPG-sim-tests to find the O2DPG repository.
         develVolumes=" ".join(
           '-v "$PWD/$(readlink {pkg} || echo {pkg})":/{pkg}:rw'.format(pkg=quote(pkg))
           for pkg in develPkgs),