From: ronan@iot.bzh <ronan@iot.bzh>
Date: Wed, 26 Oct 2016 08:58:03 +0000 (+0200)
Subject: fix default.xml file
X-Git-Tag: 2.99.3~10
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=bc820808d7c20fc41fb8d01063cd90331ac1511e;p=AGL%2FAGL-repo.git

fix default.xml file

Change-Id: I0182c8c7e4bae9c565f0e80ada0d0e13781c770a
Signed-off-by: ronan@iot.bzh <ronan@iot.bzh>
---

diff --git a/default.xml b/default.xml
index 57904f46..79ed3289 100644
--- a/default.xml
+++ b/default.xml
@@ -25,23 +25,23 @@
            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" />
-  <project name="AGL/meta-agl-devel" path="meta-agl-devel" />
+  <project name="AGL/meta-agl" path="meta-agl" revision="sandbox/ronan/morty" />
+  <project name="AGL/meta-agl-extra" path="meta-agl-extra" revision="sandbox/ronan/morty"/>
+  <project name="AGL/meta-agl-demo" path="meta-agl-demo" revision="sandbox/ronan/morty"/>
+  <project name="AGL/meta-agl-devel" path="meta-agl-devel" revision="master"/>
 
   <!-- 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.5.x in branch jethro -->
-  <project name="meta-qt5/meta-qt5" path="meta-qt5" remote="github" revision="d715f2c1d340fa38f8a9860acc73de5e14a38b75" upstream="krogoth" />
+  <project name="meta-qt5/meta-qt5" path="meta-qt5" remote="github" revision="morty" />
 
   <!-- Porter specific things. -->
-  <project name="AGL/meta-renesas" path="meta-renesas" />
+  <project name="AGL/meta-renesas" path="meta-renesas"  revision="sandbox/ronan/morty" />
 
   <!-- 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" />
@@ -49,7 +49,7 @@
   <!-- <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 -->
 
   <!-- 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.1.1" />
diff --git a/morty.xml b/morty.xml
deleted file mode 100644
index 79ed3289..00000000
--- a/morty.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-
-  <remote name="agl"
-         fetch="https://gerrit.automotivelinux.org/gerrit/"
-        review="https://gerrit.automotivelinux.org/gerrit/"
-  />
-
-  <remote name="yocto"
-          fetch="git://git.yoctoproject.org/" />
-  <remote name="openembedded"
-          fetch="git://git.openembedded.org/" />
-
-  <!-- meta-rust --> <!-- freescale bsp --> <!-- meta-amb -->
-  <!-- meta-qt5  -->
-  <remote name="github" fetch="https://github.com/" />
-
-  <!-- 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" revision="sandbox/ronan/morty" />
-  <project name="AGL/meta-agl-extra" path="meta-agl-extra" revision="sandbox/ronan/morty"/>
-  <project name="AGL/meta-agl-demo" path="meta-agl-demo" revision="sandbox/ronan/morty"/>
-  <project name="AGL/meta-agl-devel" path="meta-agl-devel" revision="master"/>
-
-  <!-- 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.5.x in branch jethro -->
-  <project name="meta-qt5/meta-qt5" path="meta-qt5" remote="github" revision="morty" />
-
-  <!-- Porter specific things. -->
-  <project name="AGL/meta-renesas" path="meta-renesas"  revision="sandbox/ronan/morty" />
-
-  <!-- MinnowBoard MAX specific things -->
-  <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-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 -->
-
-  <!-- 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.1.1" />
-
-  <!-- meta-amb -->
-  <project name="tripzero/meta-amb" path="meta-amb" remote="github" revision="master" />
-
-  <!-- meta-rust -->
-  <project name="konsulko/meta-rust" path="meta-rust" remote="github" revision="krogoth" />
-
-  <!-- rpi 2 and 3 -->
-  <project name="meta-raspberrypi" path="meta-raspberrypi" remote="yocto" revision="krogoth" />
-
-  <!-- DragonBoard 410c specific things -->
-  <project name="meta-qcom" path="meta-qcom" remote="yocto" revision="krogoth" />
-
-  <!-- Image Security Analysis FrameWork (isafw) -->
-  <project name="meta-security-isafw" path="meta-security-isafw" remote="01org" revision="master" />
-
-  <!-- IoT Security layer -->
-  <project name="meta-intel-iot-security" path="meta-intel-iot-security" remote="01org" revision="20bbb97f6d5400b126ae96ef446c3e60c7e16285" />
-
-</manifest>