diff options
| author | Jürg Billeter <j@bitron.ch> | 2020-01-23 15:56:18 +0100 |
|---|---|---|
| committer | Jürg Billeter <j@bitron.ch> | 2020-02-11 21:08:59 +0100 |
| commit | 83c210ef715014db459a2996ddef447bc1969257 (patch) | |
| tree | 0e154331a90f4010a46d28a9175ff72524281016 /src/buildstream/element.py | |
| parent | 3669dcd8ed57ccb0849858302c1d9887b05afb54 (diff) | |
| download | buildstream-83c210ef715014db459a2996ddef447bc1969257.tar.gz | |
element.py: Store sources vdir when caching buildtrees
This will be used for incremental (workspace) builds. Always store
sources when already caching buildtrees. The overhead is expected to be
negligible as the buildtree is normally a superset of the sources.
Diffstat (limited to 'src/buildstream/element.py')
| -rw-r--r-- | src/buildstream/element.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/buildstream/element.py b/src/buildstream/element.py index 41030168d..a25528ee7 100644 --- a/src/buildstream/element.py +++ b/src/buildstream/element.py @@ -254,6 +254,7 @@ class Element(Plugin): self.__cached_remotely = None # Whether the element is cached remotely # List of Sources self.__sources = [] # type: List[Source] + self.__sources_vdir = None # Directory with staged sources self.__weak_cache_key = None # Our cached weak cache key self.__strict_cache_key = None # Our cached cache key for strict builds self.__artifacts = context.artifactcache # Artifact cache @@ -1393,6 +1394,8 @@ class Element(Plugin): reason="import-source-files-fail", ) + self.__sources_vdir = import_dir + # Set update_mtime to ensure deterministic mtime of sources at build time with utils._deterministic_umask(): vdirectory.import_files(import_dir, update_mtime=BST_ARBITRARY_TIMESTAMP) @@ -1615,6 +1618,7 @@ class Element(Plugin): sandbox_vroot = sandbox.get_virtual_directory() collectvdir = None sandbox_build_dir = None + sourcesvdir = None cache_buildtrees = context.cache_buildtrees build_success = buildresult[0] @@ -1639,6 +1643,8 @@ class Element(Plugin): # if the directory could not be found. pass + sourcesvdir = self.__sources_vdir + if collect is not None: try: collectvdir = sandbox_vroot.descend(*collect.lstrip(os.sep).split(os.sep)) @@ -1650,7 +1656,7 @@ class Element(Plugin): self.__update_cache_key_non_strict() with self.timed_activity("Caching artifact"): - artifact_size = self.__artifact.cache(sandbox_build_dir, collectvdir, buildresult, publicdata) + artifact_size = self.__artifact.cache(sandbox_build_dir, collectvdir, sourcesvdir, buildresult, publicdata) if collect is not None and collectvdir is None: raise ElementError( |