From: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Date: Fri, 21 Feb 2020 16:20:15 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/next'
X-Git-Tag: 9.99.1~23
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=df112753707a1f291127df7fd23d5bacab40a08a;hp=15b338bdbf77cccfaee49cd89ec717dc374cc7e2;p=AGL%2FAGL-repo.git

Merge remote-tracking branch 'origin/next'

* origin/next:
  Update meta-spdxscanner
  Update some layers to latest zeus
  [RCAR] Activate RCAR layers for yocto zeus BSP v3.21.0
  Update to latest zeus commits
  Update meta-security layer to zeus
  Update to zeus branch or disable if not available
  Uprev to next branch

Change-Id: I8ba9757038ef0a62a4034b6f11a7478bd6a95248
---

diff --git a/default-floating.xml b/default-floating.xml
index 9a7779a5..79e1170f 100644
--- a/default-floating.xml
+++ b/default-floating.xml
@@ -11,7 +11,7 @@
   <remote name="github" fetch="https://github.com/" />
 
   <!-- defaults -->
-  <default remote="agl" sync-j="4" revision="master"/>
+  <default remote="agl" sync-j="4" revision="next"/>
 
 
   <!-- CORE -->
diff --git a/default.xml b/default.xml
index a9cbacb3..989264f3 100644
--- a/default.xml
+++ b/default.xml
@@ -11,7 +11,7 @@
   <remote name="github" fetch="https://github.com/" />
 
   <!-- defaults -->
-  <default remote="agl" sync-j="4" revision="master"/>
+  <default remote="agl" sync-j="4" revision="next"/>
 
 
   <!-- CORE -->
@@ -31,74 +31,82 @@
   <!-- YOCTO & OE -->
 
   <!-- Yocto/OpenEmbedded things. -->
-  <project name="poky" path="external/poky" remote="yocto" revision="51f6145f8f99a02df1dad937684f014b0172e72a" upstream="thud" />
-  <project name="meta-gplv2" path="external/meta-gplv2" remote="yocto" revision="aabc30f3bd03f97326fb8596910b94639fea7575" upstream="thud" />
-  <project name="openembedded/meta-openembedded" path="external/meta-openembedded" remote="github" revision="446bd615fd7cb9bc7a159fe5c2019ed08d1a7a93" upstream="thud" />
+  <project name="poky" path="external/poky" remote="yocto" revision="cf92a2d567260b91a259652bad0ecd790750f710" upstream="zeus" />
+  <project name="meta-gplv2" path="external/meta-gplv2" remote="yocto" revision="0f4eecc000f66d114ad258fa31aed66afa292166" upstream="zeus" />
+  <project name="openembedded/meta-openembedded" path="external/meta-openembedded" remote="github" revision="e855ecc6d35677e79780adc57b2552213c995731" upstream="zeus" />
 
 
   <!-- UPSTREAM COMPONENTS -->
 
   <!-- meta-virtualization -->
-  <project name="meta-virtualization" path="external/meta-virtualization" remote="yocto" revision="7685c7d415e0002c448007960837ae8898cd57a5" upstream="thud"/>
+  <project name="meta-virtualization" path="external/meta-virtualization" remote="yocto" revision="f4262ab75d36a06c528cc1630b48b817fb0acf8f" upstream="zeus"/>
 
   <!-- Qt things -->
-  <project name="meta-qt5/meta-qt5" path="external/meta-qt5" remote="github" revision="1520d5b2b2beec5e1c3209d3178219e93ef08bca" upstream="thud"/>
+  <project name="meta-qt5/meta-qt5" path="external/meta-qt5" remote="github" revision="a582fd4c810529e9af0c81700407b1955d1391d2" upstream="zeus"/>
 
-  <!-- Updater layers. -->
-  <project name="advancedtelematic/meta-updater" path="external/meta-updater" remote="github" revision="b3e96c54e1d1b16ee8e1df335599a41001650e39" upstream="thud"/>
-  <project name="advancedtelematic/meta-updater-qemux86-64" path="external/meta-updater-qemux86-64" remote="github" revision="ede8396667508eaeb18db4a6e8544f5d1280e0df" upstream="thud"/>
-  <project name="advancedtelematic/meta-updater-raspberrypi" path="external/meta-updater-raspberrypi" remote="github" revision="ef5e2c20b617e3934e040f3f543f772dd5eabb90" upstream="thud"/>
+  <!-- Updater layers. --> 
+  <project name="advancedtelematic/meta-updater" path="external/meta-updater" remote="github" revision="a6ef1ed2784fde198baef0e6b12e4b0d86e8bb66" upstream="zeus"/>
+  <project name="advancedtelematic/meta-updater-qemux86-64" path="external/meta-updater-qemux86-64" remote="github" revision="c3ec073527518f9f90e42286cf3b41cb837c881c" upstream="zeus"/>
+  <project name="advancedtelematic/meta-updater-raspberrypi" path="external/meta-updater-raspberrypi" remote="github" revision="bc36a8f6cc578a97cb4b1e42f1d24bc97c5be8e0" upstream="zeus"/>
 
   <!-- Security layer -->
-  <project name="meta-security" path="external/meta-security" remote="yocto" revision="31dc4e7532fa7a82060e0b50e5eb8d0414aa7e93" upstream="thud"/>
+  <project name="meta-security" path="external/meta-security" remote="yocto" revision="27ddb455543b670097e252ba0d0ad5b7e4101748" upstream="zeus"/>
 
   <!-- SmartDeviceLink layer -->
+<!-- no zeus branch. FIXME
   <project name="phongt/meta-sdl" path="external/meta-sdl" remote="github" revision="ab1e345171e799216b8fcb432943a2de5ff66f5f" upstream="thud"/>
+-->
 
   <!-- meta-spdxscanner - support for fossology -->
-  <project name="dl9pf/meta-spdxscanner" path="external/meta-spdxscanner" remote="github" revision="6f15ec80a60cfde6a80076a8af05bf0f99eee92d" upstream="master"/>
+  <project name="dl9pf/meta-spdxscanner" path="external/meta-spdxscanner" remote="github" revision="0feeb60abc03e603838042afbbbbdb6126c788f8" upstream="master"/>
 
   <!-- Alexa Auto SDK layer -->
   <project name="alexa/alexa-auto-sdk" path="external/alexa-auto-sdk" remote="github" revision="86916d2d8c1702a8be3c88a9012ca56583bcc0c8" upstream="2.0"/>
 
   <!-- clang support -->
-  <project name="kraj/meta-clang" path="external/meta-clang" remote="github" revision="22f0b0eaad454279c604a83dba53be6e6efb1a06" upstream="thud"/>
-
+  <project name="kraj/meta-clang" path="external/meta-clang" remote="github" revision="9cab6bc46cf44d13f8fea3b827e298a4f6e16b17" upstream="zeus"/>
 
   <!-- BSPs -->
 
   <!-- Renesas Gen3 specific things -->
-  <project name="AGL/meta-renesas-rcar-gen3" path="bsp/meta-renesas-rcar-gen3" />
-  <project name="CogentEmbedded/meta-rcar" path="bsp/meta-rcar" remote="github" revision="e9bf7907fcf1f3013705de10a37b7561f6660e3c" upstream="thud-v3.21.0"/>
+  <project name="AGL/meta-renesas-rcar-gen3" path="bsp/meta-renesas-rcar-gen3"/>
+  <project name="CogentEmbedded/meta-rcar" path="bsp/meta-rcar" remote="github" revision="05b94a3b4e1cafc508a529f949ee2631a5a32e24" upstream="zeus-Yocto-v3.21.0"/>
 
-  <!-- MinnowBoard MAX specific things -->
-  <project name="meta-intel" path="bsp/meta-intel" remote="yocto" revision="278f0b5fa2f1836635178bdc770e035d77ae03c7" upstream="thud"/>
+  <!-- MinnowBoard MAX / Upsquared specific things -->
+<!-- FIXME: To be merged with qemux86-64 target! -->
+  <project name="meta-intel" path="bsp/meta-intel" remote="yocto" revision="b04e1edb9300a57e200a187a3255f67b50519202" upstream="zeus"/>
 
   <!-- consolidate on meta-freescale from git.yoctoproject.org -->
-  <project name="meta-freescale" path="bsp/meta-freescale" remote="yocto" revision="f5c932229c31b612cba38c2ed6f3c3ec6b800e92" upstream="thud"/>
-  <project name="Freescale/meta-freescale-3rdparty" path="bsp/meta-freescale-3rdparty" remote="github" revision="c4b5ac6b20e4245ce0630e9197313aaef999a331" upstream="thud"/>
+  <project name="meta-freescale" path="bsp/meta-freescale" remote="yocto" revision="610f109acc264d5b0bd79aefcfa61b72456da90a" upstream="zeus"/>
+  <project name="Freescale/meta-freescale-3rdparty" path="bsp/meta-freescale-3rdparty" remote="github" revision="aea3771baa77e74762358ceb673d407e36637e5f" upstream="zeus"/>
 
-  <!-- Boundary devices bsp layer -->
+  <!-- Boundary devices BSP layer -->
+<!-- FIXME zeus 
   <project name="boundarydevices/meta-boundary" path="bsp/meta-boundary" remote="github" revision="4ea73c57f125ff0b8c3e17e5cc5d07b6168bbd6c" upstream="master"/>
+-->
 
-  <!-- ti vayu / jacinto 6 / DRA7 -->
-  <project name="meta-ti" path="bsp/meta-ti" remote="yocto" revision="727411f95ef1f66034beac08702f21b30a1b84c9" upstream="thud"/>
+  <!-- TI Vayu / Jacinto 6 / DRA7 -->
+  <project name="meta-ti" path="bsp/meta-ti" remote="yocto" revision="19a73c96bd05a74711a36a61077e8a7b88b55c63" upstream="zeus"/>
 
-  <!-- rpi 2, 3 and 3 B+ -->
-  <project name="meta-raspberrypi" path="bsp/meta-raspberrypi" remote="yocto" revision="4e5be97d75668804694412f9b86e9291edb38b9d" upstream="thud"/>
+  <!-- Raspberry Pi 3, 3B+, and 4 -->
+  <project name="meta-raspberrypi" path="bsp/meta-raspberrypi" remote="yocto" revision="85b75588fdedf72242870628f7c22f034d308740" upstream="zeus"/>
 
   <!-- DragonBoard 410c specific things -->
-  <project name="meta-qcom" path="bsp/meta-qcom" remote="yocto" revision="d0a58e836444a7118acfc5a99d8cacaa5ae09f5c" upstream="thud"/>
+  <project name="meta-qcom" path="bsp/meta-qcom" remote="yocto" revision="01df13dfce2753465c8eff6d2bccfb0eb412cd34" upstream="zeus"/>
 
   <!-- Altera SOCFPGA platform -->
   <!-- https://github.com/kraj/meta-altera -->
-  <project name="kraj/meta-altera" path="bsp/meta-altera" remote="github" revision="8a1d00568078790dac6fc0d94ed199b850f3bb75" upstream="thud"/>
+  <project name="kraj/meta-altera" path="bsp/meta-altera" remote="github" revision="acc930857608eb4750015257084e3ee0ef2af74b" upstream="master"/>
 
   <!-- Sancloud BSP layers -->
-  <project name="SanCloudLtd/meta-sancloud" path="bsp/meta-sancloud" remote="github" revision="81c7f1bf9d0739892f72ff108474f3996f0a00b1" upstream="thud"/>
+<!-- FIXME zeus - no zeus layer, yet.
+  <project name="SanCloudLtd/meta-sancloud" path="bsp/meta-sancloud" remote="github" revision="9b837baf403ab7c38de2e05e8c3183e1ab54cfd3" upstream="thud"/>
   <project name="EmbeddedAndroid/meta-rtlwifi" path="bsp/meta-rtlwifi" remote="github" revision="fd7ca0ca47c7095ced62a5a7cdef040dff87fb76" upstream="master"/>
+-->
 
   <!-- meta-synopsys - support for ARC HSDK board -->
-  <project name="foss-for-synopsys-dwc-arc-processors/meta-synopsys" path="bsp/meta-synopsys" remote="github" revision="c4fb64eba16782524448c8287656b907633fd0ed" upstream="halibut-agl"/>
+<!-- FIXME zeus - no zeus layer, yet
+  <project name="foss-for-synopsys-dwc-arc-processors/meta-synopsys" path="bsp/meta-synopsys" remote="github" revision="702a0e826e87796aefa97abc1de0217d3775fd13" upstream="thud-agl"/>
+-->
 
 </manifest>