From af74eaeda04ab4cbca42abc4bb4818a9b3df465e Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@theqtcompany.com>
Date: Tue, 9 Jun 2015 13:29:16 +0300
Subject: tibidabo: use latest version poky for tibidabo

Instead of using old patched version of poky for the meta-tibidabo layer,
use the same version of all the meta layer as for the other devices.
This requires the old u-boot, kernel, gpu driver and imx-lib recipes
to be copied from meta-fsl-arm.

Change-Id: I2e804fbe895370c23f8ae89cff4fe283302dabe1
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com>
---
 scripts/manifest.xml          | 10 ++++++++--
 scripts/manifest_dizzy.xml    | 10 ++++++++--
 scripts/manifest_tibidabo.xml | 31 -------------------------------
 3 files changed, 16 insertions(+), 35 deletions(-)
 delete mode 100644 scripts/manifest_tibidabo.xml

(limited to 'scripts')

diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 714a84d..2a39879 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -9,6 +9,7 @@
   <remote fetch="git://github.com/beagleboard" name="beagleboard"/>
   <remote fetch="git://github.com/meta-qt5" name="qt5"/>
   <remote fetch="git://git.toradex.com" name="toradex"/>
+  <remote fetch="git://github.com/architech-boards" name="architech"/>
   <remote fetch="ssh://qt-gerrit.ci.local/QtRD-15810" name="gerrit"/>
 
   <project name="poky"
@@ -28,7 +29,7 @@
            remote="yocto"
            revision="db1571f40c375a398a8cdbb42de4c4f272ab0cd1"
            path="sources/meta-fsl-arm"
-           groups="notdefault,fsl,toradex"/>
+           groups="notdefault,fsl,toradex,architech"/>
   <project name="meta-ti"
            remote="yocto"
            revision="6d1c337af7d43953f6d0802ffd0bf1d9d3cfb146"
@@ -43,7 +44,7 @@
            remote="freescale"
            revision="794e46e0b0a3e7e270a2f3c217d8fe5751a6b2c6"
            path="sources/meta-fsl-arm-extra"
-           groups="notdefault,fsl,toradex"/>
+           groups="notdefault,fsl,toradex,architech"/>
   <project name="meta-beagleboard"
            remote="beagleboard"
            revision="b5c709b2b6bd3bf236df923fa8f245a00fbb1b60"
@@ -54,6 +55,11 @@
            revision="36c19b10b340983946f8f52ab7fa91d9aa1e53f6"
            path="sources/meta-toradex"
            groups="notdefault,toradex"/>
+  <project name="meta-tibidabo"
+           remote="architech"
+           revision="06c6b09e0776507e1230aa98b5ca10d9d3968286"
+           path="sources/meta-tibidabo"
+           groups="notdefault,architech"/>
 
 </manifest>
 
diff --git a/scripts/manifest_dizzy.xml b/scripts/manifest_dizzy.xml
index ac9098f..956ff74 100644
--- a/scripts/manifest_dizzy.xml
+++ b/scripts/manifest_dizzy.xml
@@ -9,6 +9,7 @@
   <remote fetch="git://github.com/beagleboard" name="beagleboard"/>
   <remote fetch="git://github.com/meta-qt5" name="qt5"/>
   <remote fetch="git://git.toradex.com" name="toradex"/>
+  <remote fetch="git://github.com/architech-boards" name="architech"/>
   <remote fetch="ssh://qt-gerrit.ci.local/QtRD-15810" name="gerrit"/>
 
   <project name="poky"
@@ -28,7 +29,7 @@
            remote="yocto"
            revision="dizzy"
            path="sources/meta-fsl-arm"
-           groups="notdefault,fsl,toradex"/>
+           groups="notdefault,fsl,toradex,architech"/>
   <project name="meta-ti"
            remote="yocto"
            revision="master"
@@ -43,7 +44,7 @@
            remote="freescale"
            revision="dizzy"
            path="sources/meta-fsl-arm-extra"
-           groups="notdefault,fsl,toradex"/>
+           groups="notdefault,fsl,toradex,architech"/>
   <project name="meta-beagleboard"
            remote="beagleboard"
            revision="master"
@@ -54,6 +55,11 @@
            revision="V2.3-next"
            path="sources/meta-toradex"
            groups="notdefault,toradex"/>
+  <project name="meta-tibidabo"
+           remote="architech"
+           revision="dora"
+           path="sources/meta-tibidabo"
+           groups="notdefault,architech"/>
 
 </manifest>
 
diff --git a/scripts/manifest_tibidabo.xml b/scripts/manifest_tibidabo.xml
deleted file mode 100644
index 97c18dd..0000000
--- a/scripts/manifest_tibidabo.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-
-  <default sync-j="4" revision="dora"/>
-
-  <remote fetch="git://git.yoctoproject.org" name="yocto"/>
-  <remote fetch="git://git.openembedded.org" name="oe"/>
-  <remote fetch="git://github.com/Freescale" name="freescale"/>
-  <remote fetch="https://github.com/architech-boards/" name="architech"/>
-
-  <project name="poky"
-           remote="yocto"
-           revision="84c2763fa0bf08a83caa2c5ee532b5bef2ff918b"
-           path="sources/poky"/>
-  <project name="meta-openembedded"
-           remote="oe"
-           revision="40e0f371f3eb1628655c484feac0cebf810737b4"
-           path="sources/meta-openembedded"/>
-
-  <project name="meta-fsl-arm"
-           remote="yocto"
-           revision="fb1681666fac9c096314cd01242be4613b7ff140"
-           path="sources/meta-fsl-arm"
-           groups="notdefault,architech"/>
-  <project name="meta-tibidabo"
-           remote="architech"
-           revision="06c6b09e0776507e1230aa98b5ca10d9d3968286"
-           path="sources/meta-tibidabo"
-           groups="notdefault,architech"/>
-
-</manifest>
-- 
cgit v1.2.3-54-g00ecf