summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2020-05-12 15:58:38 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2020-05-12 22:03:34 +0000
commit394fb134b3d9b0f0852cc383be27ea26f1b83175 (patch)
treefe185e566d1ccf7dedc1f9929c0d51fa2fedcb61
parent52d9bcf06b32daebad69758f0541ad4a71ad38b0 (diff)
Pull down meta-python2 in support of the chromium builds
Although python2 is out of support, the chromium build still depends on it until upstream fixed their dependencies and a patch can be integrated. Thus as a stop-gap add the meta-python2 layer in the chromium build. Bug-AGL: SPEC-3354 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Change-Id: I0e7b8ba84b69aa3d72c67dd020efaec675096fd2
-rw-r--r--default-floating.xml3
-rw-r--r--default.xml4
2 files changed, 7 insertions, 0 deletions
diff --git a/default-floating.xml b/default-floating.xml
index dc8ccb7d..6320118b 100644
--- a/default-floating.xml
+++ b/default-floating.xml
@@ -9,6 +9,7 @@
/>
<remote name="yocto" fetch="https://git.yoctoproject.org/git/" />
<remote name="github" fetch="https://github.com/" />
+ <remote name="openembedded" fetch="https://git.openembedded.org/" />
<!-- defaults -->
<default remote="agl" sync-j="4" revision="master"/>
@@ -70,6 +71,8 @@
<!-- clang support -->
<project name="kraj/meta-clang" path="external/meta-clang" remote="github" revision="master"/>
+ <!-- meta-python2 as stop-gap to allow chromium to build until upstream fixed the dependencies" -->
+ <project name="meta-python2" path="external/meta-python2" remote="openembedded" revision="dunfell" />
<!-- BSPs -->
diff --git a/default.xml b/default.xml
index 1ce4bc7d..d86676a3 100644
--- a/default.xml
+++ b/default.xml
@@ -9,6 +9,7 @@
/>
<remote name="yocto" fetch="https://git.yoctoproject.org/git/" />
<remote name="github" fetch="https://github.com/" />
+ <remote name="openembedded" fetch="https://git.openembedded.org/" />
<!-- defaults -->
<default remote="agl" sync-j="4" revision="master"/>
@@ -69,6 +70,9 @@
<!-- clang support -->
<project name="kraj/meta-clang" path="external/meta-clang" remote="github" revision="b9e7c299d426e7e22e3ee45bebb5206ad8bc54fd" upstream="master"/>
+ <!-- meta-python2 as stop-gap to allow chromium to build until upstream fixed the dependencies" -->
+ <project name="meta-python2" path="external/meta-python2" remote="openembedded" revision="e2ef0dd8fa13d6b96e44773b09d07e4817d0a44d" upstream="dunfell" />
+
<!-- BSPs -->
<!-- Renesas Gen3 specific things -->