X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=default.xml;h=efe9e398d46aef83a79a8c7d3c6d31ca0e241f12;hb=refs%2Fchanges%2F55%2F8655%2F1;hp=8b3f625f300fffe9171bfdda844ac5a417c32aca;hpb=90c4340d4bf36360a9a9d95c6d3c61db41a6cbb0;p=AGL%2FAGL-repo.git

diff --git a/default.xml b/default.xml
index 8b3f625f..efe9e398 100644
--- a/default.xml
+++ b/default.xml
@@ -12,13 +12,13 @@
   <remote name="openembedded"
           fetch="git://git.openembedded.org/" />
 
-  <!-- meta-rust --> <!-- freescale bsp --> <!-- meta-amb -->
-  <!-- meta-qt5  -->
+  <!-- meta-rust --> <!-- freescale bsp --> <!-- 01.org -->
   <remote name="github" fetch="https://github.com/" />
 
-  <!-- 01.org (Intel) -->
-  <remote name="01org" fetch="https://github.com/01org/" />
+  <!-- meta-qt5  -->
+  <remote name="qt.io" fetch="git://code.qt.io/" />
 
+  <!-- fsl/nxp --> <!-- likely broken -->
   <remote fetch="git://git.freescale.com/imx" name="fsl-release" />
 
   <default revision="master"
@@ -32,11 +32,14 @@
   <project name="AGL/meta-agl-devel" path="meta-agl-devel" />
 
   <!-- Yocto/OpenEmbedded things. -->
-  <project name="poky" path="poky" remote="yocto" revision="krogoth" />
-  <project name="meta-openembedded" path="meta-openembedded" remote="openembedded" revision="krogoth" />
+  <project name="poky" path="poky" remote="yocto" revision="morty" />
+  <project name="meta-openembedded" path="meta-openembedded" remote="openembedded" revision="morty" />
 
-  <!-- Qt things --> <!-- meta-qt5 has qt5.7 in branch morty -->
+  <!-- Qt things --> <!-- meta-qt5 has qt5.7.x in branch morty -->
   <project name="meta-qt5/meta-qt5" path="meta-qt5" remote="github" revision="morty" />
+  <!-- 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" />
@@ -45,38 +48,41 @@
   <project name="CogentEmbedded/meta-rcar" path="meta-rcar" remote="github" revision="v2.12.0" />
 
   <!-- MinnowBoard MAX specific things -->
-  <project name="meta-intel" path="meta-intel" remote="yocto" revision="krogoth" />
+  <project name="meta-intel" path="meta-intel" remote="yocto" revision="morty" />
 
   <!-- i.MX6 / e.g. wandboard specific things -->
-  <project name="meta-fsl-arm" path="meta-fsl-arm" remote="yocto" revision="krogoth" />
-  <project name="Freescale/meta-fsl-arm-extra" path="meta-fsl-arm-extra" remote="github" revision="krogoth" />
+  <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 -->
 
   <!-- Boundary devices bsp layer -->
-  <project name="boundarydevices/meta-boundary" path="github" remote="github" revision="krogoth" />
+  <project name="boundarydevices/meta-boundary" path="meta-boundary" remote="github" revision="morty" />
 
   <!-- ti vayu / jacinto 6 / DRA7 -->
-  <project name="meta-ti" path="meta-ti" remote="yocto" revision="krogoth" />
+  <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" />
 
-  <!-- meta-amb -->
-  <project name="tripzero/meta-amb" path="meta-amb" remote="github" revision="master" />
-
   <!-- meta-rust -->
-  <project name="meta-rust/meta-rust" path="meta-rust" remote="github" revision="d0663639a08ed60bb83fd6eb99e3e2045b21b53c" />
+  <project name="meta-rust/meta-rust" path="meta-rust" remote="github" revision="a506df4ba4b186e311117d5bdc6a54844583a4fd" />
 
   <!-- rpi 2 and 3 -->
-  <project name="meta-raspberrypi" path="meta-raspberrypi" remote="yocto" revision="krogoth" />
+  <project name="meta-raspberrypi" path="meta-raspberrypi" remote="yocto" revision="69c56754bdd6417de5b69d3c8c3684ecff8e4651" />
 
   <!-- DragonBoard 410c specific things -->
-  <project name="meta-qcom" path="meta-qcom" remote="yocto" revision="krogoth" />
+  <project name="meta-qcom" path="meta-qcom" remote="yocto" revision="morty" />
+
+  <!-- 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="4364dbfcb600da82ecdfc4797f112d187e40f1c3" />
 
   <!-- 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" />
 
 </manifest>