From f775774f21c3edbb73e19031d6d38c603f42f16b Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Thu, 2 Jun 2016 12:58:54 +0300
Subject: qt5: update submodules and meta-qt5

Disable SHA checking for Qt modules, so we can use sha1s from the
release branch without breaking build after release.

Change-Id: I97b4d29fdbaceea9529fa2550564951f2186435f
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
---
 scripts/manifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 5912e6f..282ce69 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -25,7 +25,7 @@
            path="sources/meta-openembedded"/>
   <project name="meta-qt5"
            remote="qtyocto"
-           revision="afb62012ec358e12fcad06e8096be1f6ec13f1ba"
+           revision="ce9a8d9537e3baa7d485128a3f41451d7dca7770"
            path="sources/meta-qt5"/>
   <project name="meta-mingw"
            remote="qtyocto"
-- 
cgit v1.2.3-54-g00ecf


From 73ad73c800e73ea7972bea63dc36c92315c0faca Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Tue, 7 Jun 2016 15:41:34 +0300
Subject: Use git.qt.io as the new playground repo server

Change-Id: I644a749b97343f32d2aea403ac075247ac3e1931
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
---
 scripts/manifest.xml      | 2 +-
 scripts/manifest_fido.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 282ce69..46fbbea 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -13,7 +13,7 @@
   <remote fetch="http://codereview.qt-project.org/yocto" name="qtyocto"/>
   <remote fetch="git://git.yoctoproject.org" name="intel"/>
   <remote fetch="git://github.com/openembedded" name="oe-mirror"/>
-  <remote fetch="git://playground.ci.local" name="playground"/>
+  <remote fetch="ssh://git@git.qt.io/boot2qt" name="playground"/>
 
   <project name="poky"
            remote="yocto"
diff --git a/scripts/manifest_fido.xml b/scripts/manifest_fido.xml
index be15f02..2a5808c 100644
--- a/scripts/manifest_fido.xml
+++ b/scripts/manifest_fido.xml
@@ -13,7 +13,7 @@
   <remote fetch="http://codereview.qt-project.org/yocto" name="qtyocto"/>
   <remote fetch="git://git.yoctoproject.org" name="intel"/>
   <remote fetch="git://github.com/openembedded" name="oe-mirror"/>
-  <remote fetch="git://playground.ci.local" name="playground"/>
+  <remote fetch="ssh://git@git.qt.io/boot2qt" name="playground"/>
 
   <project name="poky"
            remote="yocto"
-- 
cgit v1.2.3-54-g00ecf


From 26d76bfcb8a0e263c79e40023659c1e09148e1f0 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Wed, 8 Jun 2016 09:00:08 +0300
Subject: meta layer was renamed to meta-boot2qt

Change-Id: I1b96be87215a6ddf720c83693df1f3bcc2a99b66
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
---
 b2qt-init-build-env                    |  4 ++--
 conf/bblayers.conf.bbb.sample          |  6 +++---
 conf/bblayers.conf.emulator.sample     |  2 +-
 conf/bblayers.conf.fsl.sample          |  4 ++--
 conf/bblayers.conf.nuc.sample          |  4 ++--
 conf/bblayers.conf.nvidia-logan.sample |  4 ++--
 conf/bblayers.conf.rpi.sample          |  4 ++--
 conf/bblayers.conf.sample              | 10 +++++-----
 conf/bblayers.conf.smx6.sample         |  6 +++---
 conf/bblayers.conf.ti.sample           |  4 ++--
 conf/bblayers.conf.tibidabo.sample     |  6 +++---
 conf/bblayers.conf.toradex.sample      |  6 +++---
 scripts/build-all.sh                   |  2 +-
 scripts/setup-environment.sh           |  8 ++++----
 14 files changed, 35 insertions(+), 35 deletions(-)

(limited to 'scripts')

diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index cd5952f..c9c5f46 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -174,8 +174,8 @@ init() {
   ${REPO} init ${REPO_URL} -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g "${PROJECT_GROUPS}" ${REFERENCE}
   ${REPO} sync
 
-  if [ ! -e "sources/meta-b2qt" ]; then
-    ln -s ${DIR} sources/meta-b2qt
+  if [ ! -e "sources/meta-boot2qt" ]; then
+    ln -s ${DIR} sources/meta-boot2qt
   fi
 
   if [ ! -e "sources/meta-qt5" ]  && [ -e "${DIR}/../meta-qt5" ]; then
diff --git a/conf/bblayers.conf.bbb.sample b/conf/bblayers.conf.bbb.sample
index 617e039..fc68a36 100644
--- a/conf/bblayers.conf.bbb.sample
+++ b/conf/bblayers.conf.bbb.sample
@@ -38,9 +38,9 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-ruby \
-  ${BSPDIR}/sources/meta-b2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-ti-extras \
-  ${BSPDIR}/sources/meta-b2qt/meta-beagleboard-extras \
+  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \
+  ${BSPDIR}/sources/meta-boot2qt/meta-beagleboard-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
diff --git a/conf/bblayers.conf.emulator.sample b/conf/bblayers.conf.emulator.sample
index 4703b10..f1a722d 100644
--- a/conf/bblayers.conf.emulator.sample
+++ b/conf/bblayers.conf.emulator.sample
@@ -35,7 +35,7 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-ruby \
-  ${BSPDIR}/sources/meta-b2qt \
+  ${BSPDIR}/sources/meta-boot2qt \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
diff --git a/conf/bblayers.conf.fsl.sample b/conf/bblayers.conf.fsl.sample
index b05310d..4581cbf 100644
--- a/conf/bblayers.conf.fsl.sample
+++ b/conf/bblayers.conf.fsl.sample
@@ -37,8 +37,8 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-ruby \
-  ${BSPDIR}/sources/meta-b2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \
+  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
diff --git a/conf/bblayers.conf.nuc.sample b/conf/bblayers.conf.nuc.sample
index fe8fe20..01c6703 100644
--- a/conf/bblayers.conf.nuc.sample
+++ b/conf/bblayers.conf.nuc.sample
@@ -37,8 +37,8 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-ruby \
-  ${BSPDIR}/sources/meta-b2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-nuc-extras \
+  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-nuc-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
diff --git a/conf/bblayers.conf.nvidia-logan.sample b/conf/bblayers.conf.nvidia-logan.sample
index 0c8fb99..84fa455 100644
--- a/conf/bblayers.conf.nvidia-logan.sample
+++ b/conf/bblayers.conf.nvidia-logan.sample
@@ -36,8 +36,8 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-ruby \
-  ${BSPDIR}/sources/meta-b2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-nvidia-logan-extras \
+  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-nvidia-logan-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
diff --git a/conf/bblayers.conf.rpi.sample b/conf/bblayers.conf.rpi.sample
index 3be5ea3..4345135 100644
--- a/conf/bblayers.conf.rpi.sample
+++ b/conf/bblayers.conf.rpi.sample
@@ -36,8 +36,8 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-ruby \
-  ${BSPDIR}/sources/meta-b2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-raspberrypi-extras \
+  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-raspberrypi-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample
index db9ac22..b69608f 100644
--- a/conf/bblayers.conf.sample
+++ b/conf/bblayers.conf.sample
@@ -38,11 +38,11 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-toradex \
   ${BSPDIR}/sources/meta-openembedded/meta-oe \
   ${BSPDIR}/sources/meta-openembedded/meta-ruby \
-  ${BSPDIR}/sources/meta-b2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-ti-extras \
-  ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \
-  ${BSPDIR}/sources/meta-b2qt/meta-beagleboard-extras \
-  ${BSPDIR}/sources/meta-b2qt/meta-toradex-extras \
+  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \
+  ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
+  ${BSPDIR}/sources/meta-boot2qt/meta-beagleboard-extras \
+  ${BSPDIR}/sources/meta-boot2qt/meta-toradex-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
diff --git a/conf/bblayers.conf.smx6.sample b/conf/bblayers.conf.smx6.sample
index f604394..5daec93 100644
--- a/conf/bblayers.conf.smx6.sample
+++ b/conf/bblayers.conf.smx6.sample
@@ -38,9 +38,9 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-ruby \
-  ${BSPDIR}/sources/meta-b2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \
-  ${BSPDIR}/sources/meta-b2qt/meta-smx6-extras \
+  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
+  ${BSPDIR}/sources/meta-boot2qt/meta-smx6-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
diff --git a/conf/bblayers.conf.ti.sample b/conf/bblayers.conf.ti.sample
index 20addb8..0e0ddec 100644
--- a/conf/bblayers.conf.ti.sample
+++ b/conf/bblayers.conf.ti.sample
@@ -37,8 +37,8 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-ruby \
-  ${BSPDIR}/sources/meta-b2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-ti-extras \
+  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
diff --git a/conf/bblayers.conf.tibidabo.sample b/conf/bblayers.conf.tibidabo.sample
index 21d53e9..18412bc 100644
--- a/conf/bblayers.conf.tibidabo.sample
+++ b/conf/bblayers.conf.tibidabo.sample
@@ -37,9 +37,9 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-python \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
-  ${BSPDIR}/sources/meta-b2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \
-  ${BSPDIR}/sources/meta-b2qt/meta-architech-extras \
+  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
+  ${BSPDIR}/sources/meta-boot2qt/meta-architech-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
diff --git a/conf/bblayers.conf.toradex.sample b/conf/bblayers.conf.toradex.sample
index 6cb549f..72d0d2c 100644
--- a/conf/bblayers.conf.toradex.sample
+++ b/conf/bblayers.conf.toradex.sample
@@ -38,9 +38,9 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-ruby \
-  ${BSPDIR}/sources/meta-b2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \
-  ${BSPDIR}/sources/meta-b2qt/meta-toradex-extras \
+  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
+  ${BSPDIR}/sources/meta-boot2qt/meta-toradex-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
diff --git a/scripts/build-all.sh b/scripts/build-all.sh
index 057eb7b..d3502ba 100755
--- a/scripts/build-all.sh
+++ b/scripts/build-all.sh
@@ -40,7 +40,7 @@ for DIR in $(ls -d build-*); do
     bitbake b2qt-embedded-image meta-toolchain-b2qt-embedded-sdk
     if [ $? = 0 ]; then
         if [ -n "${UPLOAD}" ]; then
-            ../sources/meta-b2qt/scripts/upload.sh
+            ../sources/meta-boot2qt/scripts/upload.sh
         fi
     else
         echo "    build failed" >> ../build.log
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 566b708..56aadc0 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -85,18 +85,18 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
   esac
 
   mkdir -p ${PWD}/${BUILDDIRECTORY}/conf
-  cp ${PWD}/sources/meta-b2qt/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf
+  cp ${PWD}/sources/meta-boot2qt/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf
 
   if [ ! -d ${PWD}/sources/meta-qt5 ]; then
     sed -i -e '/meta-qt5/d' ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf
   fi
 
-  if [ ! -d ${PWD}/sources/meta-b2qt/.git ]; then
-    QT_SDK_PATH=$(readlink -f ${PWD}/sources/meta-b2qt/../../../../)
+  if [ ! -d ${PWD}/sources/meta-boot2qt/.git ]; then
+    QT_SDK_PATH=$(readlink -f ${PWD}/sources/meta-boot2qt/../../../../)
   fi
 fi
 
-export TEMPLATECONF="${PWD}/sources/meta-b2qt/conf"
+export TEMPLATECONF="${PWD}/sources/meta-boot2qt/conf"
 . sources/poky/oe-init-build-env ${BUILDDIRECTORY}
 
 # use sources from Qt SDK if that is available
-- 
cgit v1.2.3-54-g00ecf