From 85ac803a1d7311fae2487ccfad3aceb17289ff9d Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Fri, 13 Jun 2014 11:44:53 +0300
Subject: Include toradex repository

Toradex has lot's of dependencies, so BBMASK is updated to remove
all recipes not suitable for us.

Change-Id: Iddc4b7582fee2728f944e3dd803a7c9114932a62
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
---
 b2qt-init-build-env | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'b2qt-init-build-env')

diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index 952e4a3..882e7fa 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -57,6 +57,10 @@ if [ ! -d ${BUILDDIR}/poky/meta-raspberrypi ]; then
     git clone git://git.yoctoproject.org/meta-raspberrypi ${BUILDDIR}/poky/meta-raspberrypi -b daisy
 fi
 
+if [ ! -d ${BUILDDIR}/poky/meta-toradex ]; then
+    git clone git://git.toradex.com/meta-toradex.git ${BUILDDIR}/poky/meta-toradex -b V2.2
+fi
+
 if [ ! -d ${BUILDDIR}/poky/meta-b2qt ]; then
     ln -s ${DIR} ${BUILDDIR}/poky/meta-b2qt
 fi
-- 
cgit v1.2.3-54-g00ecf


From 905a9cea99c050eef1d1c8189dcf8783dcf72443 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Wed, 25 Jun 2014 12:38:37 +0300
Subject: Use specific SHA1 from all of the meta repos

Updates on the upstream meta repos can break b2qt-meta repo at anytime.
When checking out meta repos, use the same version from which the released
images were build.

Change-Id: I669093747e79841148617e69aeb6dfea9b908b40
Reviewed-by: Kalle Viironen <kalle.viironen@digia.com>
Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
---
 README              | 16 ++++++++--------
 b2qt-init-build-env | 51 +++++++++++++++++++++++++--------------------------
 2 files changed, 33 insertions(+), 34 deletions(-)

(limited to 'b2qt-init-build-env')

diff --git a/README b/README
index 0134574..b3b55a4 100644
--- a/README
+++ b/README
@@ -28,31 +28,31 @@ OpenEmbedded and Yocto.
 
 This layer depends on:
 
-URI: git://git.openembedded.org/openembedded-core
+URI: git://git.yoctoproject.org/poky
 branch: daisy
-revision: HEAD
+revision: b0ce70ffa820c8b4069bdb413f7aa9db668b9428
 
 URI: git://git.openembedded.org/meta-openembedded
 layer: meta-oe
 branch: daisy
-revision: HEAD
+revision: a6dcf6265822ca1484d991d10a3042e04a960cdb
 
 URI: git://git.yoctoproject.org/meta-ti
 branch: daisy
-revision: HEAD
+revision: 5dad1bc02dd922a6c4fa4d68f6ea9ec779cf5e66
 
 URI: git://git.yoctoproject.org/meta-fsl-arm
 branch: daisy
-revision: HEAD
+revision: f5bf277a5a5fba2c3b64ed7d2dbec1903d96386b
 
 URI: git://github.com/Freescale/meta-fsl-arm-extra
 branch: daisy
-revision: HEAD
+revision: 029f535cfbc5746288c6129babb2d7679927a183
 
 URI: git://git.yoctoproject.org/meta-raspberrypi
 branch: daisy
-revision: HEAD
+revision: cc74bf6c1f9ab9beea52c4c75797f3ad51f72c55
 
 URI: git://git.toradex.com/meta-toradex.git
 branch: V2.2
-revision: HEAD
+revision: 371ea626f29a2a12294ab6ea30e36743a9e2f78f
diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index 882e7fa..bc747b8 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -33,33 +33,32 @@ mkdir -p ${1}
 DIR=$(readlink -f $(dirname $0))
 BUILDDIR=$(readlink -f $1)
 
-if [ ! -d ${BUILDDIR}/poky ]; then
-    git clone git://git.yoctoproject.org/poky ${BUILDDIR}/poky -b daisy
-fi
-
-if [ ! -d ${BUILDDIR}/poky/meta-openembedded ]; then
-    git clone git://git.openembedded.org/meta-openembedded ${BUILDDIR}/poky/meta-openembedded -b daisy
-fi
-
-if [ ! -d ${BUILDDIR}/poky/meta-ti ]; then
-    git clone git://git.yoctoproject.org/meta-ti ${BUILDDIR}/poky/meta-ti -b daisy
-fi
-
-if [ ! -d ${BUILDDIR}/poky/meta-fsl-arm ]; then
-    git clone git://git.yoctoproject.org/meta-fsl-arm ${BUILDDIR}/poky/meta-fsl-arm -b daisy
-fi
-
-if [ ! -d ${BUILDDIR}/poky/meta-fsl-arm-extra ]; then
-    git clone git://github.com/Freescale/meta-fsl-arm-extra.git ${BUILDDIR}/poky/meta-fsl-arm-extra -b daisy
-fi
+checkout() {
+    REPO=$1
+    REPODIR=${REPO##*/}
+    if [ ${REPODIR} != "poky" ]; then
+        REPODIR="poky/${REPODIR}"
+    fi
+    REF=${2%%:*}
+    SHA1=${2##*:}
+    if [ ! -d ${BUILDDIR}/${REPODIR} ]; then
+        mkdir ${BUILDDIR}/${REPODIR}
+        cd ${BUILDDIR}/${REPODIR}
+        git init
+        git remote add origin ${REPO} -f
+        git checkout ${REF}
+        git reset --hard ${SHA1}
+        cd -
+    fi
+}
 
-if [ ! -d ${BUILDDIR}/poky/meta-raspberrypi ]; then
-    git clone git://git.yoctoproject.org/meta-raspberrypi ${BUILDDIR}/poky/meta-raspberrypi -b daisy
-fi
-
-if [ ! -d ${BUILDDIR}/poky/meta-toradex ]; then
-    git clone git://git.toradex.com/meta-toradex.git ${BUILDDIR}/poky/meta-toradex -b V2.2
-fi
+checkout git://git.yoctoproject.org/poky                "daisy:b0ce70ffa820c8b4069bdb413f7aa9db668b9428"
+checkout git://git.openembedded.org/meta-openembedded   "daisy:a6dcf6265822ca1484d991d10a3042e04a960cdb"
+checkout git://git.yoctoproject.org/meta-ti             "daisy:5dad1bc02dd922a6c4fa4d68f6ea9ec779cf5e66"
+checkout git://git.yoctoproject.org/meta-fsl-arm        "daisy:f5bf277a5a5fba2c3b64ed7d2dbec1903d96386b"
+checkout git://github.com/Freescale/meta-fsl-arm-extra  "daisy:029f535cfbc5746288c6129babb2d7679927a183"
+checkout git://git.yoctoproject.org/meta-raspberrypi    "daisy:cc74bf6c1f9ab9beea52c4c75797f3ad51f72c55"
+checkout git://git.toradex.com/meta-toradex             "V2.2:371ea626f29a2a12294ab6ea30e36743a9e2f78f"
 
 if [ ! -d ${BUILDDIR}/poky/meta-b2qt ]; then
     ln -s ${DIR} ${BUILDDIR}/poky/meta-b2qt
-- 
cgit v1.2.3-54-g00ecf