git-2/git-r3.eclass: drop dev-vcs/git from DEPEND for older EAPI's
This causes circular dependency issues:
curl -> kerberos -> [pkgs] -> git.eclass -> curl
Since we're mostly on EAPI=7 now, and this eclass only needs git in
BDEPEND, and we force the SDK to be up-to-date before building any
board packages, we can cheat & elide it from DEPEND.
BUG=chromium:1042641
TEST=CQ passes
Change-Id: I051d85c0f057c23254ef4bbf9836c82def4d7702
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/eclass-overlay/+/2195742
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Chris McDonald <cjmcdonald@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
diff --git a/eclass/git-2.eclass b/eclass/git-2.eclass
index 107830f..b938345 100644
--- a/eclass/git-2.eclass
+++ b/eclass/git-2.eclass
@@ -16,10 +16,9 @@
PROPERTIES+=" live"
+# NB: We omit git for older EAPI's to avoid circular deps in board sysroots.
if [[ ${EAPI:-0} != [0123456] ]]; then
BDEPEND="dev-vcs/git"
-else
- DEPEND="dev-vcs/git"
fi
# @ECLASS-VARIABLE: EGIT_SOURCEDIR
diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
index 1a89524..3fb1ccf 100644
--- a/eclass/git-r3.eclass
+++ b/eclass/git-r3.eclass
@@ -27,10 +27,9 @@
PROPERTIES+=" live"
if [[ ! ${_INHERITED_BY_GIT_2} ]]; then
+ # NB: We omit git for older EAPI's to avoid circular deps in board sysroots.
if [[ ${EAPI:-0} != [0123456] ]]; then
BDEPEND=">=dev-vcs/git-1.8.2.1[curl]"
- else
- DEPEND=">=dev-vcs/git-1.8.2.1[curl]"
fi
fi
