X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=default-floating.xml;h=8e3da0dee26db22b88293a968d6f65cc49acc33f;hb=58b7a722f0200b7d3e50738644823dd999979b25;hp=eb7282d8172147e5db314a46a6ff1b5d22c6ac7f;hpb=08905bf842e90d76f579ccf0b4a21ffaee0a8c00;p=AGL%2FAGL-repo.git

diff --git a/default-floating.xml b/default-floating.xml
index eb7282d8..8e3da0de 100644
--- a/default-floating.xml
+++ b/default-floating.xml
@@ -7,20 +7,16 @@
          pushurl="ssh://gerrit.automotivelinux.org:29418"
   />
 
-  <remote name="yocto"
-          fetch="git://git.yoctoproject.org/" />
-  <remote name="openembedded"
-          fetch="git://git.openembedded.org/" />
+  <remote name="yocto" fetch="git://git.yoctoproject.org/" />
+  <remote name="openembedded" fetch="git://git.openembedded.org/" />
 
-  <!-- meta-rust --> <!-- freescale bsp --> <!-- 01.org -->
+  <!-- meta-updater --> <!-- freescale bsp --> <!-- 01.org -->
   <remote name="github" fetch="https://github.com/" />
 
   <!-- meta-qt5  -->
   <remote name="qt.io" fetch="git://code.qt.io/" />
 
-  <default revision="master"
-           remote="agl"
-           sync-j="4" />
+  <default remote="agl" sync-j="4" revision="master"/>
 
   <!-- AGL things. -->
   <project name="AGL/meta-agl" path="meta-agl" />
@@ -28,67 +24,62 @@
   <project name="AGL/meta-agl-devel" path="meta-agl-devel" />
   <project name="AGL/meta-agl-extra" path="meta-agl-extra" />
 
+  <!-- Renesas Gen3 specific things -->
+  <project name="AGL/meta-renesas-rcar-gen3" path="meta-renesas-rcar-gen3"/>
+  <project name="CogentEmbedded/meta-rcar" path="meta-rcar" remote="github" revision="v3.9.0"/>
+
   <!-- Updater layers. -->
-  <project name="advancedtelematic/meta-updater" path="meta-updater" remote="github" revision="pyro"/>
+  <project name="advancedtelematic/meta-updater" path="meta-updater" remote="github" revision="rocko"/>
+  <project name="advancedtelematic/meta-updater-qemux86-64" path="meta-updater-qemux86-64" remote="github" upstream="rocko"/>
 
   <!-- Yocto/OpenEmbedded things. -->
-  <!-- pinned due to changes in u-boot + image handling  - reeval for EE rc3-->
-  <project name="poky" path="poky" remote="yocto" revision="ebb625a140ef67d65dca1b262304377814eb8ed4" upstream="pyro" />
-  <project name="meta-gplv2" path="meta-gplv2" remote="yocto" revision="c7f97f199a6dd54d3f369f0465a6bfd2cfa739b9" upstream="pyro" />
-  <project name="meta-openembedded" path="meta-openembedded" remote="openembedded" revision="b2ce52334cf88e07f703cf25ced92302edd5b0e9" upstream="pyro" />
-  <project name="meta-virtualization" path="meta-virtualization" remote="yocto" revision="pyro" />
+  <project name="poky" path="poky" remote="yocto" revision="rocko" />
+  <project name="meta-gplv2" path="meta-gplv2" remote="yocto" revision="rocko" />
+  <project name="meta-openembedded" path="meta-openembedded" remote="openembedded" revision="rocko" />
+  <project name="meta-virtualization" path="meta-virtualization" remote="yocto" revision="rocko"/>
 
   <!-- Qt things -->
   <!-- Qt 5.8 -->
-  <project name="meta-qt5/meta-qt5" path="meta-qt5" remote="github" revision="pyro" />
-  <!-- switch from opensource project meta-qt5 to vendor-maintained repo -->
-  <!-- QT uses vendor branch 5.8 -->
-  <!--<project name="yocto/meta-qt5" path="meta-qt5" remote="qt.io" revision="5.8" />-->
-
-  <!-- Porter specific things. -->
-  <project name="AGL/meta-renesas" path="meta-renesas" />
-
-  <!-- Renesas Gen3 specific things -->
-  <project name="AGL/meta-renesas-rcar-gen3" path="meta-renesas-rcar-gen3" revision="master" />
+  <project name="meta-qt5/meta-qt5" path="meta-qt5" remote="github" revision="rocko"/>
 
   <!-- MinnowBoard MAX specific things -->
-  <project name="meta-intel" path="meta-intel" remote="yocto" revision="pyro" />
+  <project name="meta-intel" path="meta-intel" remote="yocto" revision="rocko"/>
 
   <!-- i.MX6 / e.g. wandboard specific things -->
-  <project name="Freescale/meta-freescale" path="meta-freescale" remote="github" revision="pyro" />
-  <project name="Freescale/meta-freescale-3rdparty" path="meta-freescale-3rdparty" remote="github" revision="pyro" />
-  <project name="Freescale/meta-freescale-distro" path="meta-freescale-distro" remote="github" revision="pyro" />
+  <!--
+  <project name="Freescale/meta-freescale" path="meta-freescale" remote="github" revision="06178400afbd641a6709473fd21d893dcd3cfbfa" upstream="pyro"/>
+  <project name="Freescale/meta-freescale-3rdparty" path="meta-freescale-3rdparty" remote="github" revision="35badbde05d4f10d4faeefc30bc126b5bd228e2e" upstream="pyro"/>
+  <project name="Freescale/meta-freescale-distro" path="meta-freescale-distro" remote="github" revision="cd5c7a2539f40004f74126e9fdf08254fd9a6390" upstream="pyro"/>
+  -->
+  <!-- consolidate on meta-freescale from git.yoctoproject.org -->
+  <project name="meta-freescale" path="meta-freescale" remote="yocto" revision="rocko"/>
 
   <!-- Boundary devices bsp layer -->
-  <project name="boundarydevices/meta-boundary" path="meta-boundary" remote="github" revision="pyro" />
+  <project name="boundarydevices/meta-boundary" path="meta-boundary" remote="github" revision="rocko"/>
 
   <!-- ti vayu / jacinto 6 / DRA7 -->
-  <project name="meta-ti" path="meta-ti" remote="yocto" revision="master" />
+  <project name="meta-ti" path="meta-ti" remote="yocto" revision="rocko"/>
 
   <!-- iotivity -->
-  <project name="meta-oic" path="meta-oic" remote="yocto" revision="1.2.1" />
-
-  <!-- meta-rust -->
-  <project name="meta-rust/meta-rust" path="meta-rust" remote="github" revision="pyro" />
+  <project name="meta-oic" path="meta-oic" remote="yocto" revision="1.2.1"/>
 
   <!-- rpi 2 and 3 -->
-  <project name="meta-raspberrypi" path="meta-raspberrypi" remote="yocto" revision="pyro" />
+  <project name="meta-raspberrypi" path="meta-raspberrypi" remote="yocto" revision="rocko"/>
 
   <!-- DragonBoard 410c specific things -->
-  <project name="meta-qcom" path="meta-qcom" remote="yocto" revision="pyro" />
+  <project name="meta-qcom" path="meta-qcom" remote="yocto" revision="rocko"/>
 
   <!-- Altera SOCFPGA platform --> <!-- pinned to version from master until branch for morty exists -->
   <!-- https://github.com/kraj/meta-altera -->
-  <project name="kraj/meta-altera" path="meta-altera" remote="github" revision="d4bbb7ef016eab4ab04c3e794dfe6f4276196c66" upstream="master"/>
+  <project name="kraj/meta-altera" path="meta-altera" remote="github" revision="rocko"/>
 
   <!-- Image Security Analysis FrameWork (isafw) -->
-  <!-- use morty branch for CC and DD - conflicting changes in master-->
-  <project name="01org/meta-security-isafw" path="meta-security-isafw" remote="github" revision="morty" />
+  <!-- try master or disable -->
+  <project name="01org/meta-security-isafw" path="meta-security-isafw" remote="github" revision="master"/>
 
-  <!-- IoT Security layer -->
-  <!-- fixed version since 3936bc3 removed cynara -->
-  <project name="01org/meta-intel-iot-security" path="meta-intel-iot-security" remote="github" revision="20bbb97f6d5400b126ae96ef446c3e60c7e16285" />
+  <!-- Security layer -->
+  <project name="meta-security" path="meta-security" remote="yocto" revision="master" />
 
   <!-- SmartDeviceLink layer -->
-  <project name="phongt/meta-sdl" path="meta-sdl" remote="github" revision="d9451f4d2dd1a3927b0ce5e55a4f0dc9a3daee27" />
+  <project name="phongt/meta-sdl" path="meta-sdl" remote="github" upstream="release/4.4.0" />
 </manifest>