Skip to contentSkip to conversation

Pull request

PATCH New Anuj Mittal 1 participant 2 messages Apr 29, 2022

lore
Share & tools
lore
#0 lore raw

cover Pull request

A single change to fix issues with git before 3.4.4.

Please review and merge. Tested on autobuilder and no problems seen:

https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/3591

Thanks,

Anuj

The following changes since commit d411ea3114cde55ae68a2d437e854c5b17f78131:

shadow-native: Simplify and fix syslog disable patch (2022-04-25 14:09:47 +0800)

are available in the Git repository at:

git://push.openembedded.org/openembedded-core-contrib stable/honister-next

Ross Burton (1):
bitbake.conf: mark all directories as safe for git to read

 meta/conf/bitbake.conf | 8 ++++++++
 1 file changed, 8 insertions(+)
Signature · 1 line
2.35.1
#1 lore raw

PATCH 1/1 bitbake.conf: mark all directories as safe for git to read

From: Ross Burton <[email protected]>

Recent git releases containing [1] have an ownership check when opening repositories, and refuse to open a repository if it is owned by a different user.

This breaks any use of git in do_install, as that is executed by the (fake) root user. Whilst not common, this does happen.

Setting the git configuration safe.directories=* disables this check, so that git is usable in fakeroot tasks. This can be set globally via the internal environment variable GIT_CONFIG_PARAMETERS, we can't use GIT_CONFIG_*_KEY/VALUE as that isn't present in all the releases which have the ownership check.

We already set GIT_CEILING_DIRECTORIES to ensure that git doesn't recurse up out of the work directory, so this isn't a security issue.

[1] https://github.com/git/git/commit/8959555cee7ec045958f9b6dd62e541affb7e7d9

(cherry picked from commit 8bed8e6993e7297bdcd68940aa0d47ef47120117)
---
 meta/conf/bitbake.conf | 8 ++++++++
 1 file changed, 8 insertions(+)
meta/conf/bitbake.conf +8 -0
index c2cb2f0d9d..51253003fd 100644
@@ -730,10 +730,18 @@ export PKG_CONFIG_DISABLE_UNINSTALLED = "yes"
 export PKG_CONFIG_SYSTEM_LIBRARY_PATH = "${base_libdir}:${libdir}"
 export PKG_CONFIG_SYSTEM_INCLUDE_PATH = "${includedir}"
 
+# Git configuration
+
 # Don't allow git to chdir up past WORKDIR so that it doesn't detect the OE
 # repository when building a recipe
 export GIT_CEILING_DIRECTORIES = "${WORKDIR}"
 
+# Treat all directories are safe, as during fakeroot tasks git will run as
+# root so recent git releases (eg 2.30.3) will refuse to work on repositories. See
+# https://github.com/git/git/commit/8959555cee7ec045958f9b6dd62e541affb7e7d9 for
+# further details.
+export GIT_CONFIG_PARAMETERS="'safe.directory=*'"
+
 ###
 ### Config file processing
 ###
Signature · 1 line
2.35.1