summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2022-04-29 18:01:29 -0400
committerScott Murray <scott.murray@konsulko.com>2022-04-29 18:01:29 -0400
commit888e9af2f0a8adef132584b5728736195b516deb (patch)
tree43ac1f3e2aeafcb001712db269f0ef2943c222de
parentff15c49b626c85b8586016ba751285fb5a714c3e (diff)
Post YP 4.0/kirkstone upgrade updates
Changes: - Switch meta-openembedded, meta-qt5, meta-python2, meta-arm, and meta-raspberrypi to their recently added kirkstone branches. - Update poky to a commit that includes the tagged 4.0 commit plus some of the post-release documentation fixes as well as some other minor fixes. The fixes to handle the change in git behavior on the build host with respect to the fix for CVE-2022-24765 are queued upstream, another update will needed next week to get them when they land. - Update meta-virtualization to latest master commit to pick up some Xen updates. A kirkstone branch should be coming for it soon, as upstream discussion indicates these changes were partly gating it. - Update meta-ti to latest master commit. One of the maintainers has indicated a kirkstone branch should be coming early next week. Bug-AGL: SPEC-4343 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ifc433115bdf57963554be5045c097aceb340e092
-rw-r--r--default-floating.xml10
-rw-r--r--default.xml20
2 files changed, 15 insertions, 15 deletions
diff --git a/default-floating.xml b/default-floating.xml
index 0cbab1b8..5dea9b55 100644
--- a/default-floating.xml
+++ b/default-floating.xml
@@ -32,7 +32,7 @@
<!-- Yocto/OpenEmbedded things. -->
<project name="poky" path="external/poky" remote="yocto" revision="kirkstone" />
<project name="meta-gplv2" path="external/meta-gplv2" remote="yocto" revision="kirkstone" />
- <project name="openembedded/meta-openembedded" path="external/meta-openembedded" remote="github" revision="master" />
+ <project name="openembedded/meta-openembedded" path="external/meta-openembedded" remote="github" revision="kirkstone" />
<!-- UPSTREAM COMPONENTS -->
@@ -41,7 +41,7 @@
<project name="meta-virtualization" path="external/meta-virtualization" remote="yocto" revision="master"/>
<!-- Qt things -->
- <project name="meta-qt5/meta-qt5" path="external/meta-qt5" remote="github" revision="master"/>
+ <project name="meta-qt5/meta-qt5" path="external/meta-qt5" remote="github" revision="kirkstone"/>
<!-- Security layer -->
<project name="meta-security" path="external/meta-security" remote="yocto" revision="kirkstone"/>
@@ -56,7 +56,7 @@
<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 fixes the dependencies -->
- <project name="meta-python2" path="external/meta-python2" remote="openembedded" revision="master" />
+ <project name="meta-python2" path="external/meta-python2" remote="openembedded" revision="kirkstone" />
<!-- meta-ros layer -->
<project name="ros/meta-ros" path="external/meta-ros" remote="github" revision="dunfell"/>
@@ -76,11 +76,11 @@
<project name="Freescale/meta-freescale-3rdparty" path="bsp/meta-freescale-3rdparty" remote="github" revision="master"/>
<!-- TI Vayu / Jacinto 6 / DRA7 -->
- <project name="meta-arm" path="bsp/meta-arm" remote="yocto" revision="master"/>
+ <project name="meta-arm" path="bsp/meta-arm" remote="yocto" revision="kirkstone"/>
<project name="meta-ti" path="bsp/meta-ti" remote="yocto" revision="master"/>
<!-- Raspberry Pi 3, 3B+, and 4 -->
- <project name="meta-raspberrypi" path="bsp/meta-raspberrypi" remote="yocto" revision="master"/>
+ <project name="meta-raspberrypi" path="bsp/meta-raspberrypi" remote="yocto" revision="kirkstone"/>
<!-- DragonBoard 410c specific things -->
<project name="meta-qcom" path="bsp/meta-qcom" remote="yocto" revision="master"/>
diff --git a/default.xml b/default.xml
index 20930efa..5db87bcf 100644
--- a/default.xml
+++ b/default.xml
@@ -29,18 +29,18 @@
<!-- YOCTO & OE -->
<!-- Yocto/OpenEmbedded things. -->
- <project name="poky" path="external/poky" remote="yocto" revision="81b4d8bc6bdc47a731a1f7ed741d7336559a1348" upstream="kirkstone" />
+ <project name="poky" path="external/poky" remote="yocto" revision="d53ac6e9561d782818d5491b7c4066f4a712d358" upstream="kirkstone" />
<project name="meta-gplv2" path="external/meta-gplv2" remote="yocto" revision="d2f8b5cdb285b72a4ed93450f6703ca27aa42e8a" upstream="kirkstone" />
- <project name="openembedded/meta-openembedded" path="external/meta-openembedded" remote="github" revision="1888971b1fcff1e86be175c2aac724c28d2840ca" upstream="master" />
+ <project name="openembedded/meta-openembedded" path="external/meta-openembedded" remote="github" revision="bb2b5b31a80eb164e47649036878773614e4dbdf" upstream="kirkstone" />
<!-- UPSTREAM COMPONENTS -->
<!-- meta-virtualization -->
- <project name="meta-virtualization" path="external/meta-virtualization" remote="yocto" revision="1f9c37e1a67a269833605a083e26538b130e4d8e" upstream="master"/>
+ <project name="meta-virtualization" path="external/meta-virtualization" remote="yocto" revision="21a5c29a10f033859f6e44aa035161befa439128" upstream="master"/>
<!-- Qt things -->
- <project name="meta-qt5/meta-qt5" path="external/meta-qt5" remote="github" revision="4837db1d965c51e4a2c5971e6a126c896e5b401a" upstream="master"/>
+ <project name="meta-qt5/meta-qt5" path="external/meta-qt5" remote="github" revision="5b71df60e523423b9df6793de9387f87a149ac42" upstream="kirkstone"/>
<!-- Security layer -->
<project name="meta-security" path="external/meta-security" remote="yocto" revision="93f2146211001ee3cf697d8428969cc3069ed6ba" upstream="kirkstone"/>
@@ -55,7 +55,7 @@
<project name="kraj/meta-clang" path="external/meta-clang" remote="github" revision="d748f542e27d58fcbcee9d1482d71cd9c38bf06b" upstream="master"/>
<!-- meta-python2 as stop-gap to allow chromium to build until upstream fixes the dependencies -->
- <project name="meta-python2" path="external/meta-python2" remote="openembedded" revision="f02882e2aa9279ca7becca8d0cedbffe88b5a253" upstream="master" />
+ <project name="meta-python2" path="external/meta-python2" remote="openembedded" revision="f02882e2aa9279ca7becca8d0cedbffe88b5a253" upstream="kirkstone" />
<!-- meta-ros layer -->
<project name="ros/meta-ros" path="external/meta-ros" remote="github" revision="7ded597103e8e54ffa979d042cdbbedb76ff7cb5" upstream="dunfell"/>
@@ -71,15 +71,15 @@
<project name="AGL/meta-agl-refhw" path="bsp/meta-agl-refhw" />
<!-- consolidate on meta-freescale from git.yoctoproject.org -->
- <project name="meta-freescale" path="bsp/meta-freescale" remote="yocto" revision="ee06b054f0d26ce8e069bfe9b0b8e320d8f2dccf" upstream="master"/>
- <project name="Freescale/meta-freescale-3rdparty" path="bsp/meta-freescale-3rdparty" remote="github" revision="f244dd4b26f5958e586f2cee3e6854489c2a049f" upstream="master"/>
+ <project name="meta-freescale" path="bsp/meta-freescale" remote="yocto" revision="96a0904cd0562378411c373f8a976c749772202b" upstream="master"/>
+ <project name="Freescale/meta-freescale-3rdparty" path="bsp/meta-freescale-3rdparty" remote="github" revision="de0eb1408150d77f9cce97c559f9a5a3c71e5d6c" upstream="master"/>
<!-- TI Vayu / Jacinto 6 / DRA7 -->
- <project name="meta-arm" path="bsp/meta-arm" remote="yocto" revision="9c0e0c01cbeb9857efaf22eb975c82cb69d1de81" upstream="master"/>
- <project name="meta-ti" path="bsp/meta-ti" remote="yocto" revision="d6494c933f7d2098af22a90f39ed652abe564b6d" upstream="master"/>
+ <project name="meta-arm" path="bsp/meta-arm" remote="yocto" revision="50b34c5cc9496441152ad28bf1022e5fc5ab0a7e" upstream="kirkstone"/>
+ <project name="meta-ti" path="bsp/meta-ti" remote="yocto" revision="60c27f59a79ef946ecfa472117a80b6aa357cddd" upstream="master"/>
<!-- Raspberry Pi 4 -->
- <project name="meta-raspberrypi" path="bsp/meta-raspberrypi" remote="yocto" revision="83f5577d8d8a5383642cd00a75ec56211596ecd2" upstream="master"/>
+ <project name="meta-raspberrypi" path="bsp/meta-raspberrypi" remote="yocto" revision="0135a02ea577bd39dd552236ead2c5894d89da1d" upstream="kirkstone"/>
<!-- DragonBoard 410c specific things -->
<project name="meta-qcom" path="bsp/meta-qcom" remote="yocto" revision="1d08de2053a3b7dee34cbd37ab22ada14d94f243" upstream="master"/>