meta layer was renamed to meta-boot2qt

Change-Id: I1b96be87215a6ddf720c83693df1f3bcc2a99b66 Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
author: Samuli Piippo <samuli.piippo@qt.io> 2016-06-08 09:00:08 +0300
committer: Samuli Piippo <samuli.piippo@qt.io> 2016-06-08 06:34:00 +0000
commit: 26d76bfcb8a0e263c79e40023659c1e09148e1f0 (patch)
tree: 27f01070634510acddaaa826098cc2b39238c431
parent: c98e5af2b81cfcd9b387c3a1e158857ab9fde76b (diff)
download: meta-boot2qt-26d76bfcb8a0e263c79e40023659c1e09148e1f0.tar.gz
14 files changed, 35 insertions, 35 deletions
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
+  if [ ! -e "sources/meta-boot2qt" ]; then
-    ln -s ${DIR} sources/meta-b2qt
+    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-boot2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-ti-extras \
+  ${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \
-  ${BSPDIR}/sources/meta-b2qt/meta-beagleboard-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-boot2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \
+  ${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-boot2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-nuc-extras \
+  ${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-boot2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-nvidia-logan-extras \
+  ${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-boot2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-raspberrypi-extras \
+  ${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-boot2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-ti-extras \
+  ${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \
-  ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \
+  ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
-  ${BSPDIR}/sources/meta-b2qt/meta-beagleboard-extras \
+  ${BSPDIR}/sources/meta-boot2qt/meta-beagleboard-extras \
-  ${BSPDIR}/sources/meta-b2qt/meta-toradex-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-boot2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \
+  ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
-  ${BSPDIR}/sources/meta-b2qt/meta-smx6-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-boot2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-ti-extras \
+  ${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-boot2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \
+  ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
-  ${BSPDIR}/sources/meta-b2qt/meta-architech-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-boot2qt \
-  ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \
+  ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
-  ${BSPDIR}/sources/meta-b2qt/meta-toradex-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
+  if [ ! -d ${PWD}/sources/meta-boot2qt/.git ]; then
-    QT_SDK_PATH=$(readlink -f ${PWD}/sources/meta-b2qt/../../../../)
+    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
author	Samuli Piippo <samuli.piippo@qt.io>	2016-06-08 09:00:08 +0300
committer	Samuli Piippo <samuli.piippo@qt.io>	2016-06-08 06:34:00 +0000
commit	26d76bfcb8a0e263c79e40023659c1e09148e1f0 (patch)
tree	27f01070634510acddaaa826098cc2b39238c431
parent	c98e5af2b81cfcd9b387c3a1e158857ab9fde76b (diff)
download	meta-boot2qt-26d76bfcb8a0e263c79e40023659c1e09148e1f0.tar.gz

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() {
174	${REPO} init ${REPO_URL} -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g "${PROJECT_GROUPS}" ${REFERENCE}	174	${REPO} init ${REPO_URL} -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g "${PROJECT_GROUPS}" ${REFERENCE}
175	${REPO} sync	175	${REPO} sync
176		176
177	if [ ! -e "sources/meta-b2qt" ]; then	177	if [ ! -e "sources/meta-boot2qt" ]; then
178	ln -s ${DIR} sources/meta-b2qt	178	ln -s ${DIR} sources/meta-boot2qt
179	fi	179	fi
180		180
181	if [ ! -e "sources/meta-qt5" ] && [ -e "${DIR}/../meta-qt5" ]; then	181	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 ?= " \
38	${BSPDIR}/sources/meta-openembedded/meta-networking \	38	${BSPDIR}/sources/meta-openembedded/meta-networking \
39	${BSPDIR}/sources/meta-openembedded/meta-initramfs \	39	${BSPDIR}/sources/meta-openembedded/meta-initramfs \
40	${BSPDIR}/sources/meta-openembedded/meta-ruby \	40	${BSPDIR}/sources/meta-openembedded/meta-ruby \
41	${BSPDIR}/sources/meta-b2qt \	41	${BSPDIR}/sources/meta-boot2qt \
42	${BSPDIR}/sources/meta-b2qt/meta-ti-extras \	42	${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \
43	${BSPDIR}/sources/meta-b2qt/meta-beagleboard-extras \	43	${BSPDIR}/sources/meta-boot2qt/meta-beagleboard-extras \
44	${BSPDIR}/sources/meta-mingw \	44	${BSPDIR}/sources/meta-mingw \
45	${BSPDIR}/sources/meta-qt5 \	45	${BSPDIR}/sources/meta-qt5 \
46	"	46	"


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 ?= " \
35	${BSPDIR}/sources/meta-openembedded/meta-networking \	35	${BSPDIR}/sources/meta-openembedded/meta-networking \
36	${BSPDIR}/sources/meta-openembedded/meta-initramfs \	36	${BSPDIR}/sources/meta-openembedded/meta-initramfs \
37	${BSPDIR}/sources/meta-openembedded/meta-ruby \	37	${BSPDIR}/sources/meta-openembedded/meta-ruby \
38	${BSPDIR}/sources/meta-b2qt \	38	${BSPDIR}/sources/meta-boot2qt \
39	${BSPDIR}/sources/meta-mingw \	39	${BSPDIR}/sources/meta-mingw \
40	${BSPDIR}/sources/meta-qt5 \	40	${BSPDIR}/sources/meta-qt5 \
41	"	41	"


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 ?= " \
37	${BSPDIR}/sources/meta-openembedded/meta-networking \	37	${BSPDIR}/sources/meta-openembedded/meta-networking \
38	${BSPDIR}/sources/meta-openembedded/meta-initramfs \	38	${BSPDIR}/sources/meta-openembedded/meta-initramfs \
39	${BSPDIR}/sources/meta-openembedded/meta-ruby \	39	${BSPDIR}/sources/meta-openembedded/meta-ruby \
40	${BSPDIR}/sources/meta-b2qt \	40	${BSPDIR}/sources/meta-boot2qt \
41	${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \	41	${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
42	${BSPDIR}/sources/meta-mingw \	42	${BSPDIR}/sources/meta-mingw \
43	${BSPDIR}/sources/meta-qt5 \	43	${BSPDIR}/sources/meta-qt5 \
44	"	44	"


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 ?= " \
37	${BSPDIR}/sources/meta-openembedded/meta-networking \	37	${BSPDIR}/sources/meta-openembedded/meta-networking \
38	${BSPDIR}/sources/meta-openembedded/meta-initramfs \	38	${BSPDIR}/sources/meta-openembedded/meta-initramfs \
39	${BSPDIR}/sources/meta-openembedded/meta-ruby \	39	${BSPDIR}/sources/meta-openembedded/meta-ruby \
40	${BSPDIR}/sources/meta-b2qt \	40	${BSPDIR}/sources/meta-boot2qt \
41	${BSPDIR}/sources/meta-b2qt/meta-nuc-extras \	41	${BSPDIR}/sources/meta-boot2qt/meta-nuc-extras \
42	${BSPDIR}/sources/meta-mingw \	42	${BSPDIR}/sources/meta-mingw \
43	${BSPDIR}/sources/meta-qt5 \	43	${BSPDIR}/sources/meta-qt5 \
44	"	44	"


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 ?= " \
36	${BSPDIR}/sources/meta-openembedded/meta-networking \	36	${BSPDIR}/sources/meta-openembedded/meta-networking \
37	${BSPDIR}/sources/meta-openembedded/meta-initramfs \	37	${BSPDIR}/sources/meta-openembedded/meta-initramfs \
38	${BSPDIR}/sources/meta-openembedded/meta-ruby \	38	${BSPDIR}/sources/meta-openembedded/meta-ruby \
39	${BSPDIR}/sources/meta-b2qt \	39	${BSPDIR}/sources/meta-boot2qt \
40	${BSPDIR}/sources/meta-b2qt/meta-nvidia-logan-extras \	40	${BSPDIR}/sources/meta-boot2qt/meta-nvidia-logan-extras \
41	${BSPDIR}/sources/meta-mingw \	41	${BSPDIR}/sources/meta-mingw \
42	${BSPDIR}/sources/meta-qt5 \	42	${BSPDIR}/sources/meta-qt5 \
43	"	43	"


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 ?= " \
36	${BSPDIR}/sources/meta-openembedded/meta-networking \	36	${BSPDIR}/sources/meta-openembedded/meta-networking \
37	${BSPDIR}/sources/meta-openembedded/meta-initramfs \	37	${BSPDIR}/sources/meta-openembedded/meta-initramfs \
38	${BSPDIR}/sources/meta-openembedded/meta-ruby \	38	${BSPDIR}/sources/meta-openembedded/meta-ruby \
39	${BSPDIR}/sources/meta-b2qt \	39	${BSPDIR}/sources/meta-boot2qt \
40	${BSPDIR}/sources/meta-b2qt/meta-raspberrypi-extras \	40	${BSPDIR}/sources/meta-boot2qt/meta-raspberrypi-extras \
41	${BSPDIR}/sources/meta-mingw \	41	${BSPDIR}/sources/meta-mingw \
42	${BSPDIR}/sources/meta-qt5 \	42	${BSPDIR}/sources/meta-qt5 \
43	"	43	"


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 ?= " \
38	${BSPDIR}/sources/meta-toradex \	38	${BSPDIR}/sources/meta-toradex \
39	${BSPDIR}/sources/meta-openembedded/meta-oe \	39	${BSPDIR}/sources/meta-openembedded/meta-oe \
40	${BSPDIR}/sources/meta-openembedded/meta-ruby \	40	${BSPDIR}/sources/meta-openembedded/meta-ruby \
41	${BSPDIR}/sources/meta-b2qt \	41	${BSPDIR}/sources/meta-boot2qt \
42	${BSPDIR}/sources/meta-b2qt/meta-ti-extras \	42	${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \
43	${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \	43	${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
44	${BSPDIR}/sources/meta-b2qt/meta-beagleboard-extras \	44	${BSPDIR}/sources/meta-boot2qt/meta-beagleboard-extras \
45	${BSPDIR}/sources/meta-b2qt/meta-toradex-extras \	45	${BSPDIR}/sources/meta-boot2qt/meta-toradex-extras \
46	${BSPDIR}/sources/meta-mingw \	46	${BSPDIR}/sources/meta-mingw \
47	${BSPDIR}/sources/meta-qt5 \	47	${BSPDIR}/sources/meta-qt5 \
48	"	48	"


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 ?= " \
38	${BSPDIR}/sources/meta-openembedded/meta-networking \	38	${BSPDIR}/sources/meta-openembedded/meta-networking \
39	${BSPDIR}/sources/meta-openembedded/meta-initramfs \	39	${BSPDIR}/sources/meta-openembedded/meta-initramfs \
40	${BSPDIR}/sources/meta-openembedded/meta-ruby \	40	${BSPDIR}/sources/meta-openembedded/meta-ruby \
41	${BSPDIR}/sources/meta-b2qt \	41	${BSPDIR}/sources/meta-boot2qt \
42	${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \	42	${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
43	${BSPDIR}/sources/meta-b2qt/meta-smx6-extras \	43	${BSPDIR}/sources/meta-boot2qt/meta-smx6-extras \
44	${BSPDIR}/sources/meta-mingw \	44	${BSPDIR}/sources/meta-mingw \
45	${BSPDIR}/sources/meta-qt5 \	45	${BSPDIR}/sources/meta-qt5 \
46	"	46	"


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 ?= " \
37	${BSPDIR}/sources/meta-openembedded/meta-networking \	37	${BSPDIR}/sources/meta-openembedded/meta-networking \
38	${BSPDIR}/sources/meta-openembedded/meta-initramfs \	38	${BSPDIR}/sources/meta-openembedded/meta-initramfs \
39	${BSPDIR}/sources/meta-openembedded/meta-ruby \	39	${BSPDIR}/sources/meta-openembedded/meta-ruby \
40	${BSPDIR}/sources/meta-b2qt \	40	${BSPDIR}/sources/meta-boot2qt \
41	${BSPDIR}/sources/meta-b2qt/meta-ti-extras \	41	${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \
42	${BSPDIR}/sources/meta-mingw \	42	${BSPDIR}/sources/meta-mingw \
43	${BSPDIR}/sources/meta-qt5 \	43	${BSPDIR}/sources/meta-qt5 \
44	"	44	"


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 ?= " \
37	${BSPDIR}/sources/meta-openembedded/meta-python \	37	${BSPDIR}/sources/meta-openembedded/meta-python \
38	${BSPDIR}/sources/meta-openembedded/meta-networking \	38	${BSPDIR}/sources/meta-openembedded/meta-networking \
39	${BSPDIR}/sources/meta-openembedded/meta-initramfs \	39	${BSPDIR}/sources/meta-openembedded/meta-initramfs \
40	${BSPDIR}/sources/meta-b2qt \	40	${BSPDIR}/sources/meta-boot2qt \
41	${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \	41	${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
42	${BSPDIR}/sources/meta-b2qt/meta-architech-extras \	42	${BSPDIR}/sources/meta-boot2qt/meta-architech-extras \
43	${BSPDIR}/sources/meta-mingw \	43	${BSPDIR}/sources/meta-mingw \
44	${BSPDIR}/sources/meta-qt5 \	44	${BSPDIR}/sources/meta-qt5 \
45	"	45	"


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 ?= " \
38	${BSPDIR}/sources/meta-openembedded/meta-networking \	38	${BSPDIR}/sources/meta-openembedded/meta-networking \
39	${BSPDIR}/sources/meta-openembedded/meta-initramfs \	39	${BSPDIR}/sources/meta-openembedded/meta-initramfs \
40	${BSPDIR}/sources/meta-openembedded/meta-ruby \	40	${BSPDIR}/sources/meta-openembedded/meta-ruby \
41	${BSPDIR}/sources/meta-b2qt \	41	${BSPDIR}/sources/meta-boot2qt \
42	${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \	42	${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
43	${BSPDIR}/sources/meta-b2qt/meta-toradex-extras \	43	${BSPDIR}/sources/meta-boot2qt/meta-toradex-extras \
44	${BSPDIR}/sources/meta-mingw \	44	${BSPDIR}/sources/meta-mingw \
45	${BSPDIR}/sources/meta-qt5 \	45	${BSPDIR}/sources/meta-qt5 \
46	"	46	"


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
40	bitbake b2qt-embedded-image meta-toolchain-b2qt-embedded-sdk	40	bitbake b2qt-embedded-image meta-toolchain-b2qt-embedded-sdk
41	if [ $? = 0 ]; then	41	if [ $? = 0 ]; then
42	if [ -n "${UPLOAD}" ]; then	42	if [ -n "${UPLOAD}" ]; then
43	../sources/meta-b2qt/scripts/upload.sh	43	../sources/meta-boot2qt/scripts/upload.sh
44	fi	44	fi
45	else	45	else
46	echo " build failed" >> ../build.log	46	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
85	esac	85	esac
86		86
87	mkdir -p ${PWD}/${BUILDDIRECTORY}/conf	87	mkdir -p ${PWD}/${BUILDDIRECTORY}/conf
88	cp ${PWD}/sources/meta-b2qt/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf	88	cp ${PWD}/sources/meta-boot2qt/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf
89		89
90	if [ ! -d ${PWD}/sources/meta-qt5 ]; then	90	if [ ! -d ${PWD}/sources/meta-qt5 ]; then
91	sed -i -e '/meta-qt5/d' ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf	91	sed -i -e '/meta-qt5/d' ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf
92	fi	92	fi
93		93
94	if [ ! -d ${PWD}/sources/meta-b2qt/.git ]; then	94	if [ ! -d ${PWD}/sources/meta-boot2qt/.git ]; then
95	QT_SDK_PATH=$(readlink -f ${PWD}/sources/meta-b2qt/../../../../)	95	QT_SDK_PATH=$(readlink -f ${PWD}/sources/meta-boot2qt/../../../../)
96	fi	96	fi
97	fi	97	fi
98		98
99	export TEMPLATECONF="${PWD}/sources/meta-b2qt/conf"	99	export TEMPLATECONF="${PWD}/sources/meta-boot2qt/conf"
100	. sources/poky/oe-init-build-env ${BUILDDIRECTORY}	100	. sources/poky/oe-init-build-env ${BUILDDIRECTORY}
101		101
102	# use sources from Qt SDK if that is available	102	# use sources from Qt SDK if that is available