From: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
Date: Thu, 20 Mar 2025 11:02:34 +0000 (+0100)
Subject: Revert "git: git-replacement-native: depend on ca-certificate"
X-Git-Tag: yocto-5.2~78
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d18f4d9d2ac75f58669754f1e4b7a1313eb9db32;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

Revert "git: git-replacement-native: depend on ca-certificate"

This reverts commit 2e99ffda70fd95b5eab3de47048032349cd66f4b.

git-replacement-native is used only to provide a newer version than may
be installed on the system; apart from that, it should work more or less
the same.

In particular, it is using the host system's /etc/gitconfig; it should
also use the system CA certificates, otherwise it will break HTTPS
connections in environments that need local certificates, for example
for a corporate HTTP proxy. The override had been added to deal with
curl-native relying on the existence of its workdir to access CA
certificates, which has been fixed in the curl recipe now.

Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-devtools/git/git_2.49.0.bb b/meta/recipes-devtools/git/git_2.49.0.bb
index 66082d0bdea..2ca8711f757 100644
--- a/meta/recipes-devtools/git/git_2.49.0.bb
+++ b/meta/recipes-devtools/git/git_2.49.0.bb
@@ -4,7 +4,6 @@ DESCRIPTION = "Git is a free and open source distributed version control system
 SECTION = "console/utils"
 LICENSE = "GPL-2.0-only & GPL-2.0-or-later & BSD-3-Clause & MIT & BSL-1.0 & LGPL-2.1-or-later"
 DEPENDS = "openssl zlib"
-DEPENDS:class-native += "ca-certificates"
 
 PROVIDES:append:class-native = " git-replacement-native"
 
@@ -97,7 +96,6 @@ perl_native_fixup () {
 
 REL_GIT_EXEC_PATH = "${@os.path.relpath(libexecdir, bindir)}/git-core"
 REL_GIT_TEMPLATE_DIR = "${@os.path.relpath(datadir, bindir)}/git-core/templates"
-REL_GIT_SSL_CAINFO = "${@os.path.relpath(sysconfdir, bindir)}/ssl/certs/ca-certificates.crt"
 
 do_install:append:class-target () {
 	perl_native_fixup
@@ -106,7 +104,6 @@ do_install:append:class-target () {
 do_install:append:class-native() {
 	create_wrapper ${D}${bindir}/git \
 		GIT_EXEC_PATH='`dirname $''realpath`'/${REL_GIT_EXEC_PATH} \
-		GIT_SSL_CAINFO='`dirname $''realpath`'/${REL_GIT_SSL_CAINFO} \
 		GIT_TEMPLATE_DIR='`dirname $''realpath`'/${REL_GIT_TEMPLATE_DIR}
 }