X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=default.xml;h=79d4e53bd52adbde0ff596d4ebe9ac83e4b18167;hb=f634e1712c5971c314f0656efea959715022f2be;hp=7badf853ef527f41374f10950cf75c838f64e75a;hpb=4eb57840ba57fbfda164761ba1bab4c249ffd443;p=AGL%2FAGL-repo.git

diff --git a/default.xml b/default.xml
index 7badf853..79d4e53b 100644
--- a/default.xml
+++ b/default.xml
@@ -1,91 +1,84 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
 
+  <!-- remote servers to query -->
   <remote name="agl"
          fetch="https://gerrit.automotivelinux.org/gerrit/"
          review="https://gerrit.automotivelinux.org/gerrit/"
          pushurl="ssh://gerrit.automotivelinux.org:29418"
   />
-
-  <remote name="yocto"
-          fetch="git://git.yoctoproject.org/" />
-  <remote name="openembedded"
-          fetch="git://git.openembedded.org/" />
-
-  <!-- meta-rust --> <!-- freescale bsp --> <!-- 01.org -->
+  <remote name="yocto" fetch="https://git.yoctoproject.org/git/" />
   <remote name="github" fetch="https://github.com/" />
+  <remote name="openembedded" fetch="https://git.openembedded.org/" />
 
-  <!-- meta-qt5  -->
-  <remote name="qt.io" fetch="git://code.qt.io/" />
+  <!-- defaults -->
+  <default remote="agl" sync-j="4" revision="master"/>
 
-  <!-- fsl/nxp --> <!-- likely broken -->
-  <remote fetch="git://git.freescale.com/imx" name="fsl-release" />
 
-  <default revision="master"
-           remote="agl"
-           sync-j="4" />
+  <!-- CORE -->
+  <!-- use agl revisions/branches here -->
 
   <!-- AGL things. -->
   <project name="AGL/meta-agl" path="meta-agl" />
   <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="4ebfc44b3eff288b8cc2f6b2b4251159cbeab14b"/>
+
+  <!-- ALL EXTERNAL REPOS BELOW USE A FIXED REVISION ! -->
+
+  <!-- YOCTO & OE -->
 
   <!-- 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="external/poky" remote="yocto" revision="8c489602f218bcf21de0d3c9f8cf620ea5f06430" upstream="kirkstone" />
+  <project name="openembedded/meta-openembedded" path="external/meta-openembedded" remote="github" revision="0b78362654262145415df8211052442823b9ec9b" upstream="kirkstone" />
 
-  <!-- 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" />
+  <!-- UPSTREAM COMPONENTS -->
 
-  <!-- Renesas Gen3 specific things -->
-  <project name="AGL/meta-renesas-rcar-gen3" path="meta-renesas-rcar-gen3" revision="master" />
+  <!-- meta-virtualization -->
+  <project name="meta-virtualization" path="external/meta-virtualization" remote="yocto" revision="2fae71cdf0e8c6f398f51219bdf31eac76c662ec" upstream="kirkstone"/>
+
+  <!-- Qt things -->
+  <project name="meta-qt5/meta-qt5" path="external/meta-qt5" remote="github" revision="5b71df60e523423b9df6793de9387f87a149ac42" upstream="kirkstone"/>
 
-  <!-- MinnowBoard MAX specific things -->
-  <project name="meta-intel" path="meta-intel" remote="yocto" revision="morty" />
+  <!-- Security layer -->
+  <project name="meta-security" path="external/meta-security" remote="yocto" revision="d3d8e62bf1caa3870a504c0addcfd200b33c189f" upstream="kirkstone"/>
 
-  <!-- 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 -->
+  <!-- meta-codescanner - support for using CodeScanner during the build -->
+  <project name="dl9pf/meta-codechecker" path="external/meta-codechecker" remote="github" revision="f27a46feb2291d333744850a82d5c8af303e3bd5" upstream="master"/>
 
-  <!-- Boundary devices bsp layer -->
-  <project name="boundarydevices/meta-boundary" path="meta-boundary" remote="github" revision="morty" />
+  <!-- meta-spdxscanner - support for fossology -->
+  <project name="meta-spdxscanner" path="external/meta-spdxscanner" remote="yocto" revision="25373bc58ece8b6f07680a103b4a1bbbc99e0db1" upstream="master"/>
 
-  <!-- ti vayu / jacinto 6 / DRA7 -->
-  <project name="meta-ti" path="meta-ti" remote="yocto" revision="master" />
+  <!-- clang support -->
+  <project name="kraj/meta-clang" path="external/meta-clang" remote="github" revision="85d956d95401479ca666139e31f662f60c156d5f" upstream="kirkstone"/>
 
-  <!-- iotivity -->
-  <project name="meta-oic" path="meta-oic" remote="yocto" revision="1.2.0" />
+  <!-- meta-python2 as stop-gap to allow chromium to build until upstream fixes the dependencies -->
+  <project name="meta-python2" path="external/meta-python2" remote="openembedded" revision="f02882e2aa9279ca7becca8d0cedbffe88b5a253" upstream="kirkstone" />
 
-  <!-- meta-rust -->
-  <project name="meta-rust/meta-rust" path="meta-rust" remote="github" revision="a506df4ba4b186e311117d5bdc6a54844583a4fd" />
+  <!-- meta-flutter -->
+  <project name="meta-flutter/meta-flutter" path="external/meta-flutter" remote="github" revision="3cd0ace6e85357fd41097a5878271097cb3eedaa" upstream="kirkstone"/>
 
-  <!-- rpi 2 and 3 -->
-  <project name="meta-raspberrypi" path="meta-raspberrypi" remote="yocto" revision="69c56754bdd6417de5b69d3c8c3684ecff8e4651" />
+  <!-- BSPs -->
+
+  <!-- Renesas Gen3 specific things -->
+  <project name="renesas-rcar/meta-renesas" path="bsp/meta-renesas" remote="github" revision="7320fd6e4df8d622e741c923eb13c1c355a3972c" upstream="kirkstone-dev"/>
+  <project name="CogentEmbedded/meta-rcar" path="bsp/meta-rcar" remote="github" revision="511808a3e794ad0e35386f83d3d159c9ba48b4be" upstream="kirkstone-Yocto-v5.9.0"/>
+  <project name="AGL/meta-agl-refhw" path="bsp/meta-agl-refhw" />
 
-  <!-- DragonBoard 410c specific things -->
-  <project name="meta-qcom" path="meta-qcom" remote="yocto" revision="morty" />
+  <!-- consolidate on meta-freescale from git.yoctoproject.org -->
+  <project name="meta-freescale" path="bsp/meta-freescale" remote="yocto" revision="2fb1ce365338126aad365012ebb913b3e4a9f1be" upstream="kirkstone"/>
+  <project name="Freescale/meta-freescale-3rdparty" path="bsp/meta-freescale-3rdparty" remote="github" revision="de0eb1408150d77f9cce97c559f9a5a3c71e5d6c" upstream="kirkstone"/>
 
-  <!-- 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" />
+  <!-- TI Vayu / Jacinto 6 / DRA7 -->
+  <project name="meta-arm" path="bsp/meta-arm" remote="yocto" revision="50b34c5cc9496441152ad28bf1022e5fc5ab0a7e" upstream="kirkstone"/>
+  <project name="meta-ti" path="bsp/meta-ti" remote="yocto" revision="88e8c1cbf370940fae6dac4a8b732366f75173dc" upstream="master"/>
 
-  <!-- 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" />
+  <!-- Raspberry Pi 4 -->
+  <project name="meta-raspberrypi" path="bsp/meta-raspberrypi" remote="yocto" revision="0135a02ea577bd39dd552236ead2c5894d89da1d" upstream="kirkstone"/>
 
-  <!-- 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" />
+  <!-- Sancloud BSP layers -->
+  <project name="SanCloudLtd/meta-sancloud" path="bsp/meta-sancloud" remote="github" revision="a34ca4c3fedfed1915ec3acc40bc8c0edd70e8a4" upstream="dunfell"/>
+  <project name="EmbeddedAndroid/meta-rtlwifi" path="bsp/meta-rtlwifi" remote="github" revision="98b2b2c34f186050e6092bc4f17ecb69aef6148a" upstream="master"/>
 
 </manifest>