summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRasmus Villemoes <rasmus.villemoes@prevas.dk>2024-05-30 14:34:58 +0200
committerSteve Sakoman <steve@sakoman.com>2024-06-05 05:57:12 -0700
commitae6cebca5bac9521230c69fed23b375d0de7f5f6 (patch)
tree29b98f724e50401c4c3ca413ec39bd6daf07b65a
parentd37ef8925ab293b014cde6633954bbcc880bf851 (diff)
downloadpoky-ae6cebca5bac9521230c69fed23b375d0de7f5f6.tar.gz
git: set --with-gitconfig=/etc/gitconfig for -native builds
Commit 6c2ae2346db0 (kern-tools: depend on git-replacement-native) broke our kernel builds. For saving space and time, we have a DL_DIR shared between multiple users/buildbots, not all of which run with the same uid (and with appropriate sticky bits set so that files downloaded by one user become owned by a common group and are readable by others). This works fine also for git sources because the docker images we use all have a /etc/gitconfig with [safe] directory = * But with the mentioned commit, the host's git is no longer used for do_unpack (nor for do_fetch if re-building and sysroot has already been populated by a previous build), causing spurious "fatal: detected dubious ownership..." failures. Currently, the path where the git-native binary searches for system gitconfig is the sysroot from it was built, which obviously doesn't contain a /etc/gitconfig. As for the nativesdk variant, respect the host's /etc/gitconfig if present. (From OE-Core rev: a3f5ac9f9fee2c8e10fec7c3f758e49513fef724) Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 572f511f7ff02fb559ac42d2d5dbd09fec478d97) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/recipes-devtools/git/git_2.44.0.bb1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-devtools/git/git_2.44.0.bb b/meta/recipes-devtools/git/git_2.44.0.bb
index 90e555eba7..78b00dd19f 100644
--- a/meta/recipes-devtools/git/git_2.44.0.bb
+++ b/meta/recipes-devtools/git/git_2.44.0.bb
@@ -40,6 +40,7 @@ EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl \
40 --without-iconv \ 40 --without-iconv \
41" 41"
42EXTRA_OECONF:append:class-nativesdk = " --with-gitconfig=/etc/gitconfig " 42EXTRA_OECONF:append:class-nativesdk = " --with-gitconfig=/etc/gitconfig "
43EXTRA_OECONF:append:class-native = " --with-gitconfig=/etc/gitconfig "
43 44
44# Needs brokensep as this doesn't use automake 45# Needs brokensep as this doesn't use automake
45inherit autotools-brokensep perlnative bash-completion manpages 46inherit autotools-brokensep perlnative bash-completion manpages