Merge branch 'stable' into releaseQtEE_v3.1.0

* stable:
  linux-boundary: revert 1G/3G memory split configure
  Use specific SHA1 from all of the meta repos
  beagleboard specific u-boot was removed from meta-ti
  Old libgles-omap3 packages were removed from meta-ti
  toradex: enable FunctionFS module needed for adb
  bbb: correct path for kernel configure fragment
  image: include i2c-tools in image
  adb: enabled network mode for toradex
  toradex: Add hardware acceleration for gstream
  adbd: add dependency to openssl for libcrypto
  Include toradex repository
  imx6: set preferred version for gpu drivers
  Include older Vivante drivers for Apalis iMX6
  Include support for Toradox Apalis iMX6
  BBB: enable USB serial kernel drivers
  No need for RPi in BBMASK

Change-Id: Ic3192cd00a8b24972253c64f294de5d364111135

1 files changed, 25 insertions, 22 deletions

diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index 952e4a3..bc747b8 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -33,29 +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
+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-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
-
-if [ ! -d ${BUILDDIR}/poky/meta-raspberrypi ]; then
-    git clone git://git.yoctoproject.org/meta-raspberrypi ${BUILDDIR}/poky/meta-raspberrypi -b daisy
-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