summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2025-10-08 15:02:24 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-10-09 10:58:07 +0100
commit840d4fc3c5b86ed688d85b897f0a620ba73325c4 (patch)
tree5f140e7e5233e3e5dd0ca71e7dc068649058aa2a
parent9832099afcae0a6dbf4f5e5ab35b2d19ca202560 (diff)
downloadpoky-840d4fc3c5b86ed688d85b897f0a620ba73325c4.tar.gz
bitbake.conf: add TMPDIR to GIT_CEILING_DIRECTORIES
We export GIT_CEILING_DIRECTORIES=WORKDIR to ensure that git calls inside the builds don't find oe-core when they're meant to be looking for the git repository of the source code. However, this breaks for recipes that use work-shared (such as llvm), as their working directory is outside of WORKDIR. Solve this by adding TMPDIR to the list as a final catch, but keeping WORKDIR first so that git will stop sooner in the general case. This solves reproduciblity problems in LLVM, where for example lld's version string would contain the URL and commit hash of the poky repo being built. (From OE-Core rev: f42f0185bd00e68ecc86a930487f21fc86214cfa) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/bitbake.conf6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 8d1ea5491d..5406e542db 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -775,9 +775,9 @@ export PKG_CONFIG_DISABLE_UNINSTALLED = "yes"
775export PKG_CONFIG_SYSTEM_LIBRARY_PATH = "${base_libdir}:${libdir}" 775export PKG_CONFIG_SYSTEM_LIBRARY_PATH = "${base_libdir}:${libdir}"
776export PKG_CONFIG_SYSTEM_INCLUDE_PATH = "${includedir}" 776export PKG_CONFIG_SYSTEM_INCLUDE_PATH = "${includedir}"
777 777
778# Don't allow git to chdir up past WORKDIR so that it doesn't detect the OE 778# Don't allow git to chdir up past WORKDIR or TMPDIR so that it doesn't detect the OE
779# repository when building a recipe 779# repository when building a recipe.
780export GIT_CEILING_DIRECTORIES = "${WORKDIR}" 780export GIT_CEILING_DIRECTORIES = "${WORKDIR}:${TMPDIR}"
781 781
782### 782###
783### Config file processing 783### Config file processing