Revert commits that hit master w/o review

likely a gerrit bug again. These 2 ended up in master
but should not have landed there in the first place.

Revert "fix default.xml file"
This reverts commit bc820808d7c20fc41fb8d01063cd90331ac1511e.

Revert "create morty manifest draft"
This reverts commit 6dbea6a4501d6793c4ec0edf0a11df7f59efbe9d.

Change-Id: Ic5cd1144d153eccf1d9e6caa40b147d8a40f5590
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>

diff --git a/default.xml b/default.xml
index 0ba5642..d38b83a 100644 (file)
--- a/default.xml
+++ b/default.xml
@@ -26,23 +26,23 @@
            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"/>
+  <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" />
 
   <!-- 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="poky" remote="yocto" revision="krogoth" />
+  <project name="meta-openembedded" path="meta-openembedded" remote="openembedded" revision="krogoth" />
 
   <!-- Qt things --> <!-- meta-qt5 has qt5.5.x in branch jethro -->
-  <project name="meta-qt5/meta-qt5" path="meta-qt5" remote="github" revision="morty" />
+  <project name="meta-qt5/meta-qt5" path="meta-qt5" remote="github" revision="d715f2c1d340fa38f8a9860acc73de5e14a38b75" upstream="krogoth" />
 
   <!-- Porter specific things. -->
-  <project name="AGL/meta-renesas" path="meta-renesas"  revision="sandbox/ronan/morty" />
+  <project name="AGL/meta-renesas" path="meta-renesas" />
 
   <!-- 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="krogoth" />
 
   <!-- i.MX6 / e.g. wandboard specific things -->
   <project name="meta-fsl-arm" path="meta-fsl-arm" remote="yocto" revision="krogoth" />
@@ -50,7 +50,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="master" />
+  <project name="meta-ti" path="meta-ti" remote="yocto" revision="krogoth" />
 
   <!-- iotivity -->
   <project name="meta-oic" path="meta-oic" remote="yocto" revision="1.1.1" />