X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=default.xml;h=3d25bf12ac54533a73d527d8774316ba70eb7b9e;hb=cfcb7bd1672e0e29e49b744d92d0ec7cd0f9de5f;hp=1c53eb7cd6e7108f46ab3e782d1294b7a1112158;hpb=935a8dbc6d33c035d4cb110bfec7fe948155c093;p=AGL%2FAGL-repo.git

diff --git a/default.xml b/default.xml
index 1c53eb7c..3d25bf12 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"
@@ -27,56 +27,65 @@
 
   <!-- 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" />
   <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="bae52014b6e3a49e7adf49373238dab9f5f3b4a2"/>
 
   <!-- 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" />
 
   <!-- 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="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="meta-boundary" 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="28d4404f89eb59d406b4976c0e3f5ca19137ba74" />
 
   <!-- 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>