X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=default.xml;h=46dfdc97d255af3be31f4955b383f0021eee935e;hb=refs%2Fchanges%2F77%2F11377%2F1;hp=7dffd2300ecbcb591c5d7b512b790d4022018c9f;hpb=6df4bf66a7f5520d3ece74bf979057951c2083d4;p=AGL%2FAGL-repo.git

diff --git a/default.xml b/default.xml
index 7dffd230..46dfdc97 100644
--- a/default.xml
+++ b/default.xml
@@ -12,73 +12,81 @@
   <remote name="openembedded"
           fetch="git://git.openembedded.org/" />
 
-  <!-- meta-rust --> <!-- freescale bsp -->
+  <!-- meta-rust --> <!-- freescale bsp --> <!-- 01.org -->
   <remote name="github" fetch="https://github.com/" />
 
   <!-- meta-qt5  -->
   <remote name="qt.io" fetch="git://code.qt.io/" />
 
-  <!-- 01.org (Intel) -->
-  <remote name="01org" fetch="https://github.com/01org/" />
-
-  <remote fetch="git://git.freescale.com/imx" name="fsl-release" />
-
   <default revision="master"
            remote="agl"
            sync-j="4" />
 
   <!-- AGL things. -->
   <project name="AGL/meta-agl" path="meta-agl" />
-  <project name="AGL/meta-agl-extra" path="meta-agl-extra" />
-  <project name="AGL/meta-agl-demo" path="meta-agl-demo" revision="sandbox/jsmoeller/meta-qt5-58" />
+  <project name="AGL/meta-agl-demo" path="meta-agl-demo" />
   <project name="AGL/meta-agl-devel" path="meta-agl-devel" />
+  <project name="AGL/meta-agl-extra" path="meta-agl-extra" />
+
+  <!-- Updater layers. -->
+  <project name="advancedtelematic/meta-updater" path="meta-updater" remote="github" revision="pyro"/>
 
   <!-- Yocto/OpenEmbedded things. -->
-  <project name="poky" path="poky" remote="yocto" revision="morty" />
-  <project name="meta-openembedded" path="meta-openembedded" remote="openembedded" revision="morty" />
+  <project name="poky" path="poky" remote="yocto" revision="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" />
 
-  <!-- Qt things --> <!-- meta-qt5 has qt5.7.x in branch morty -->
-  <!-- <project name="meta-qt5/meta-qt5" path="meta-qt5" remote="github" revision="morty" /> -->
+  <!-- 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" />
+  <!--<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="CogentEmbedded/meta-rcar" path="meta-rcar" remote="github" revision="v2.12.0" />
+  <project name="AGL/meta-renesas-rcar-gen3" path="meta-renesas-rcar-gen3" revision="master" />
 
   <!-- MinnowBoard MAX specific things -->
-  <project name="meta-intel" path="meta-intel" remote="yocto" revision="morty" />
+  <project name="meta-intel" path="meta-intel" remote="yocto" revision="pyro" />
 
   <!-- i.MX6 / e.g. wandboard specific things -->
-  <project name="meta-fsl-arm" path="meta-fsl-arm" remote="yocto" revision="krogoth" />  <!-- no morty branch, krogoth branch active -->
-  <project name="Freescale/meta-fsl-arm-extra" path="meta-fsl-arm-extra" remote="github" revision="morty" />
-  <!-- <project name="meta-fsl-bsp-release" path="meta-fsl-bsp-release" remote="fsl-release" revision="jethro_4.1.15-1.0.0_ga" /> To be enabled for sabre. Off due to clone time -->
+  <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" />
 
   <!-- Boundary devices bsp layer -->
-  <project name="boundarydevices/meta-boundary" path="meta-boundary" remote="github" revision="morty" />
+  <project name="boundarydevices/meta-boundary" path="meta-boundary" remote="github" revision="pyro" />
 
   <!-- ti vayu / jacinto 6 / DRA7 -->
   <project name="meta-ti" path="meta-ti" remote="yocto" revision="master" />
 
   <!-- iotivity -->
-  <project name="meta-oic" path="meta-oic" remote="yocto" revision="1.2.0" />
+  <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="a506df4ba4b186e311117d5bdc6a54844583a4fd" />
+  <project name="meta-rust/meta-rust" path="meta-rust" remote="github" revision="pyro" />
 
   <!-- rpi 2 and 3 -->
-  <project name="meta-raspberrypi" path="meta-raspberrypi" remote="yocto" revision="morty" />
+  <project name="meta-raspberrypi" path="meta-raspberrypi" remote="yocto" revision="pyro" />
 
   <!-- DragonBoard 410c specific things -->
-  <project name="meta-qcom" path="meta-qcom" remote="yocto" revision="morty" />
+  <project name="meta-qcom" path="meta-qcom" remote="yocto" revision="pyro" />
+
+  <!-- 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"/>
 
   <!-- Image Security Analysis FrameWork (isafw) -->
-  <project name="meta-security-isafw" path="meta-security-isafw" remote="01org" revision="master" />
+  <!-- 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" />
 
   <!-- IoT Security layer -->
-  <project name="meta-intel-iot-security" path="meta-intel-iot-security" remote="01org" revision="20bbb97f6d5400b126ae96ef446c3e60c7e16285" />
+  <!-- fixed version since 3936bc3 removed cynara -->
+  <project name="01org/meta-intel-iot-security" path="meta-intel-iot-security" remote="github" revision="20bbb97f6d5400b126ae96ef446c3e60c7e16285" />
 
+  <!-- SmartDeviceLink layer -->
+  <project name="phongt/meta-sdl" path="meta-sdl" remote="github" revision="d9451f4d2dd1a3927b0ce5e55a4f0dc9a3daee27" />
 </manifest>