diff options
author | Joshua Watt <JPEWhacker@gmail.com> | 2020-05-05 11:39:10 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-05-09 18:57:21 +0100 |
commit | ee763935e905334600d635b702f41ae18c6b32a0 (patch) | |
tree | 423cdbaee3b534363f79a58bbf185f67a6e677ac | |
parent | 51790fa49cdbb5b968b0ec94e95e9c6209a72415 (diff) | |
download | poky-ee763935e905334600d635b702f41ae18c6b32a0.tar.gz |
bitbake.conf: Prevent git from detecting parent repo in recipe
Prevents git commands run in a recipe from moving up past ${WORKDIR}
when searching for a .git directory, and thus prevents them from
detecting the parent OE-core .git directory. Fixes several
reproducibility issues where recipes would use the OE-core version as
the recipe version due to git walking up the tree.
(From OE-Core rev: e496605ea197414b58025293e73dec099a8976c6)
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/conf/bitbake.conf | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 4b544a22cd..bdade79abe 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -718,6 +718,10 @@ export PKG_CONFIG_DISABLE_UNINSTALLED = "yes" | |||
718 | export PKG_CONFIG_SYSTEM_LIBRARY_PATH = "${base_libdir}:${libdir}" | 718 | export PKG_CONFIG_SYSTEM_LIBRARY_PATH = "${base_libdir}:${libdir}" |
719 | export PKG_CONFIG_SYSTEM_INCLUDE_PATH = "${includedir}" | 719 | export PKG_CONFIG_SYSTEM_INCLUDE_PATH = "${includedir}" |
720 | 720 | ||
721 | # Don't allow git to chdir up past WORKDIR so that it doesn't detect the OE | ||
722 | # repository when building a recipe | ||
723 | export GIT_CEILING_DIRECTORIES = "${WORKDIR}" | ||
724 | |||
721 | ### | 725 | ### |
722 | ### Config file processing | 726 | ### Config file processing |
723 | ### | 727 | ### |
@@ -878,7 +882,7 @@ BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH BBSERVER DL_DI | |||
878 | WARN_QA ERROR_QA WORKDIR STAMPCLEAN PKGDATA_DIR BUILD_ARCH SSTATE_PKGARCH \ | 882 | WARN_QA ERROR_QA WORKDIR STAMPCLEAN PKGDATA_DIR BUILD_ARCH SSTATE_PKGARCH \ |
879 | BB_WORKERCONTEXT BB_LIMITEDDEPS BB_UNIHASH extend_recipe_sysroot DEPLOY_DIR \ | 883 | BB_WORKERCONTEXT BB_LIMITEDDEPS BB_UNIHASH extend_recipe_sysroot DEPLOY_DIR \ |
880 | SSTATE_HASHEQUIV_METHOD SSTATE_HASHEQUIV_REPORT_TASKDATA \ | 884 | SSTATE_HASHEQUIV_METHOD SSTATE_HASHEQUIV_REPORT_TASKDATA \ |
881 | SSTATE_HASHEQUIV_OWNER CCACHE_TOP_DIR BB_HASHSERVE" | 885 | SSTATE_HASHEQUIV_OWNER CCACHE_TOP_DIR BB_HASHSERVE GIT_CEILING_DIRECTORIES" |
882 | BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SSH_AGENT_PID \ | 886 | BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SSH_AGENT_PID \ |
883 | SSH_AUTH_SOCK PSEUDO_BUILD BB_ENV_EXTRAWHITE DISABLE_SANITY_CHECKS \ | 887 | SSH_AUTH_SOCK PSEUDO_BUILD BB_ENV_EXTRAWHITE DISABLE_SANITY_CHECKS \ |
884 | PARALLEL_MAKE BB_NUMBER_THREADS BB_ORIGENV BB_INVALIDCONF BBINCLUDED \ | 888 | PARALLEL_MAKE BB_NUMBER_THREADS BB_ORIGENV BB_INVALIDCONF BBINCLUDED \ |