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

diff --git a/default.xml b/default.xml
index 3d25bf12..d3d985d8 100644
--- a/default.xml
+++ b/default.xml
@@ -18,9 +18,6 @@
   <!-- 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"
            remote="agl"
            sync-j="4" />
@@ -31,61 +28,69 @@
   <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="morty" />
-  <project name="meta-openembedded" path="meta-openembedded" remote="openembedded" revision="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="AGL/meta-renesas-rcar-gen3" path="meta-renesas-rcar-gen3" revision="master" />
+  <project name="AGL/meta-renesas-rcar-gen3" path="meta-renesas-rcar-gen3"/>
+
+  <!-- Updater layers. -->
+  <project name="advancedtelematic/meta-updater" path="meta-updater" remote="github" revision="71863b9c41caeba9bc4d602a55b981743d843a5d" upstream="rocko"/>
+
+  <!-- Yocto/OpenEmbedded things. -->
+  <project name="poky" path="poky" remote="yocto" revision="refs/tags/yocto-2.4.1" upstream="rocko" />
+  <project name="meta-gplv2" path="meta-gplv2" remote="yocto" revision="c7f97f199a6dd54d3f369f0465a6bfd2cfa739b9" upstream="rocko" />
+  <project name="meta-openembedded" path="meta-openembedded" remote="openembedded" revision="a65c1acb1822966c3553de9fc98d8bb6be705c4e" upstream="rocko" />
+  <project name="meta-virtualization" path="meta-virtualization" remote="yocto" revision="4277759428e96605b8dbe95a43891e217ae8d399" upstream="rocko"/>
+
+  <!-- Qt things -->
+  <!-- Qt 5.8 -->
+  <project name="meta-qt5/meta-qt5" path="meta-qt5" remote="github" revision="db881bb4917628ad3eb1fa7c4f27915cf2ae60f4" upstream="rocko"/>
 
   <!-- 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="5415ec29c7745fafb4b7311558d206f9c81fcae4" upstream="rocko"/>
 
   <!-- 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="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="71a54c7b50221800fa4c90c30a425c2f119db3bc" upstream="rocko"/>
 
   <!-- 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="f96f41b2e5beda2b51acb702d082568898b36a68" upstream="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="ed83a43c6a76875ee5f0388b3b60a28f2a373a10" upstream="rocko"/>
 
   <!-- iotivity -->
-  <project name="meta-oic" path="meta-oic" remote="yocto" revision="1.2.0" />
+  <project name="meta-oic" path="meta-oic" remote="yocto" revision="70d5bec59a3b8aabaa4a69f1d8513ff22d86b473" upstream="1.2.1"/>
 
   <!-- meta-rust -->
-  <project name="meta-rust/meta-rust" path="meta-rust" remote="github" revision="a506df4ba4b186e311117d5bdc6a54844583a4fd" />
+  <!-- we should not need this anymore
+  <project name="meta-rust/meta-rust" path="meta-rust" remote="github" revision="94280a636c9a6dd729f9eb3ed88fe85b11ee8ffa" upstream="pyro"/>
+  -->
 
   <!-- rpi 2 and 3 -->
-  <project name="meta-raspberrypi" path="meta-raspberrypi" remote="yocto" revision="28d4404f89eb59d406b4976c0e3f5ca19137ba74" />
+  <project name="meta-raspberrypi" path="meta-raspberrypi" remote="yocto" revision="510009f0c825cd7992d2d37e9ed0007f6c3be723" upstream="rocko"/>
 
   <!-- 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="d1499bd50a3c91de0bf331009e0beed93739a926" upstream="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="4364dbfcb600da82ecdfc4797f112d187e40f1c3" />
+  <project name="kraj/meta-altera" path="meta-altera" remote="github" revision="565d8443d6dcba4e25924ba049ba81e080f87884" upstream="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" />
 </manifest>