Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/fido' into dev
Browse files Browse the repository at this point in the history 
* origin/fido:
  meta layer was renamed to meta-boot2qt
  b2qt addons: update repository urls
  Use git.qt.io as the new playground repo server
  qtconnectivity: remove incorrect PACKAGECONFIG to enable bluez support
  qt5: update submodules and meta-qt5

Conflicts:
	conf/bblayers.conf.bbb.sample
	conf/bblayers.conf.emulator.sample
	conf/bblayers.conf.fsl.sample
	conf/bblayers.conf.intel.sample
	conf/bblayers.conf.nvidia-logan.sample
	conf/bblayers.conf.rpi.sample
	conf/bblayers.conf.sample
	conf/bblayers.conf.smx6.sample
	conf/bblayers.conf.ti.sample
	conf/bblayers.conf.tibidabo.sample
	conf/bblayers.conf.toradex.sample
	conf/distro/b2qt.conf
	recipes-qt/b2qt-addons/b2qt-demos.bb
	recipes-qt/b2qt-addons/b2qt-launcher.bb
	recipes-qt/qt5-addons/qtcharts_git.bb
	recipes-qt/qt5-addons/qtdatavis3d_git.bb
	recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb
	recipes-qt/qt5-addons/qtquickcompiler_git.bb
	recipes-qt/qt5/nativesdk-qtbase_git.bbappend
	recipes-qt/qt5/qt3d_git.bbappend
	recipes-qt/qt5/qtbase-native_git.bbappend
	recipes-qt/qt5/qtbase_git.bbappend
	recipes-qt/qt5/qtcanvas3d_git.bbappend
	recipes-qt/qt5/qtconnectivity_git.bbappend
	recipes-qt/qt5/qtdeclarative_git.bbappend
	recipes-qt/qt5/qtgraphicaleffects_git.bbappend
	recipes-qt/qt5/qtimageformats_git.bbappend
	recipes-qt/qt5/qtlocation_git.bbappend
	recipes-qt/qt5/qtmultimedia_git.bbappend
	recipes-qt/qt5/qtquickcontrols2_git.bb
	recipes-qt/qt5/qtquickcontrols_git.bbappend
	recipes-qt/qt5/qtsensors_git.bbappend
	recipes-qt/qt5/qtserialbus_git.bb
	recipes-qt/qt5/qtserialport_git.bbappend
	recipes-qt/qt5/qtsvg_git.bbappend
	recipes-qt/qt5/qttools_git.bbappend
	recipes-qt/qt5/qttranslations_git.bbappend
	recipes-qt/qt5/qtvirtualkeyboard_git.bbappend
	recipes-qt/qt5/qtwayland-native_git.bbappend
	recipes-qt/qt5/qtwayland_git.bbappend
	recipes-qt/qt5/qtwebchannel_git.bbappend
	recipes-qt/qt5/qtwebengine_git.bbappend
	recipes-qt/qt5/qtwebsockets_git.bbappend
	recipes-qt/qt5/qtxmlpatterns_git.bbappend
	scripts/manifest.xml

Change-Id: I06904eb8ff7a30240ce289808f43fbba6339f670
  • Loading branch information
@sapiippo
sapiippo committed Jun 8, 2016
2 parents c13d43f + 26d76bf commit 43c5ae5
Show file tree
Hide file tree
Showing 18 changed files with 41 additions and 41 deletions.
4 changes: 2 additions & 2 deletions b2qt-init-build-env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,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
Expand Down
6 changes: 3 additions & 3 deletions conf/bblayers.conf.bbb.sample
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ BBLAYERS ?= " \
${BSPDIR}/sources/meta-openembedded/meta-networking \
${BSPDIR}/sources/meta-openembedded/meta-initramfs \
${BSPDIR}/sources/meta-openembedded/meta-multimedia \
${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 \
"
Expand Down
2 changes: 1 addition & 1 deletion conf/bblayers.conf.emulator.sample
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ BBLAYERS ?= " \
${BSPDIR}/sources/meta-openembedded/meta-networking \
${BSPDIR}/sources/meta-openembedded/meta-initramfs \
${BSPDIR}/sources/meta-openembedded/meta-multimedia \
${BSPDIR}/sources/meta-b2qt \
${BSPDIR}/sources/meta-boot2qt \
${BSPDIR}/sources/meta-mingw \
${BSPDIR}/sources/meta-qt5 \
"
Expand Down
4 changes: 2 additions & 2 deletions conf/bblayers.conf.fsl.sample
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ BBLAYERS ?= " \
${BSPDIR}/sources/meta-openembedded/meta-networking \
${BSPDIR}/sources/meta-openembedded/meta-initramfs \
${BSPDIR}/sources/meta-openembedded/meta-multimedia \
${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 \
"
Expand Down
4 changes: 2 additions & 2 deletions conf/bblayers.conf.intel.sample
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ BBLAYERS ?= " \
${BSPDIR}/sources/meta-openembedded/meta-networking \
${BSPDIR}/sources/meta-openembedded/meta-initramfs \
${BSPDIR}/sources/meta-openembedded/meta-multimedia \
${BSPDIR}/sources/meta-b2qt \
${BSPDIR}/sources/meta-b2qt/meta-intel-extras \
${BSPDIR}/sources/meta-boot2qt \
${BSPDIR}/sources/meta-boot2qt/meta-nuc-extras \
${BSPDIR}/sources/meta-mingw \
${BSPDIR}/sources/meta-qt5 \
"
Expand Down
6 changes: 3 additions & 3 deletions conf/bblayers.conf.nvidia-logan.sample
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ BBLAYERS ?= " \
${BSPDIR}/sources/meta-openembedded/meta-networking \
${BSPDIR}/sources/meta-openembedded/meta-initramfs \
${BSPDIR}/sources/meta-openembedded/meta-multimedia \
${BSPDIR}/sources/meta-b2qt \
${BSPDIR}/sources/meta-b2qt/meta-vib3-extras \
${BSPDIR}/sources/meta-b2qt/meta-tegra-extras \
${BSPDIR}/sources/meta-boot2qt \
${BSPDIR}/sources/meta-boot2qt/meta-vib3-extras \
${BSPDIR}/sources/meta-boot2qt/meta-tegra-extras \
${BSPDIR}/sources/meta-mingw \
${BSPDIR}/sources/meta-qt5 \
"
Expand Down
4 changes: 2 additions & 2 deletions conf/bblayers.conf.rpi.sample
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ BBLAYERS ?= " \
${BSPDIR}/sources/meta-openembedded/meta-networking \
${BSPDIR}/sources/meta-openembedded/meta-initramfs \
${BSPDIR}/sources/meta-openembedded/meta-multimedia \
${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 \
"
Expand Down
10 changes: 5 additions & 5 deletions conf/bblayers.conf.sample
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ BBLAYERS ?= " \
${BSPDIR}/sources/meta-toradex \
${BSPDIR}/sources/meta-openembedded/meta-oe \
${BSPDIR}/sources/meta-openembedded/meta-multimedia \
${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 \
"
Expand Down
6 changes: 3 additions & 3 deletions conf/bblayers.conf.smx6.sample
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ BBLAYERS ?= " \
${BSPDIR}/sources/meta-openembedded/meta-networking \
${BSPDIR}/sources/meta-openembedded/meta-initramfs \
${BSPDIR}/sources/meta-openembedded/meta-multimedia \
${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 \
"
Expand Down
4 changes: 2 additions & 2 deletions conf/bblayers.conf.ti.sample
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ BBLAYERS ?= " \
${BSPDIR}/sources/meta-openembedded/meta-networking \
${BSPDIR}/sources/meta-openembedded/meta-initramfs \
${BSPDIR}/sources/meta-openembedded/meta-multimedia \
${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 \
"
Expand Down
6 changes: 3 additions & 3 deletions conf/bblayers.conf.tibidabo.sample
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ BBLAYERS ?= " \
${BSPDIR}/sources/meta-openembedded/meta-networking \
${BSPDIR}/sources/meta-openembedded/meta-initramfs \
${BSPDIR}/sources/meta-openembedded/meta-multimedia \
${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 \
"
Expand Down
6 changes: 3 additions & 3 deletions conf/bblayers.conf.toradex.sample
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ BBLAYERS ?= " \
${BSPDIR}/sources/meta-openembedded/meta-networking \
${BSPDIR}/sources/meta-openembedded/meta-initramfs \
${BSPDIR}/sources/meta-openembedded/meta-multimedia \
${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 \
"
Expand Down
2 changes: 1 addition & 1 deletion recipes-qt/b2qt-addons/b2qt-demos.bb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ LIC_FILES_CHKSUM = "file://about-b2qt/AboutBoot2Qt.qml;md5=b0a1a6eef4a172b0a8cb4
inherit qmake5 sdk-sources

SRC_URI = " \
git://codereview.qt-project.org/tqtc-boot2qt/demos.git;branch=${BRANCH};protocol=ssh;name=demos;sdk-uri=5.7/Boot2Qt/sources/b2qt-demos \
git://codereview.qt-project.org/qt-apps/boot2qt-demos.git;branch=${BRANCH};protocol=ssh;name=demos \
${QT_GIT}/qtcanvas3d.git;branch=${QT_BRANCH};name=qtcanvas3d;destsuffix=qtcanvas3d \
${QT_GIT}/qtquickcontrols.git;branch=${QT_BRANCH};name=qtquickcontrols;destsuffix=qtquickcontrols \
git://codereview.qt-project.org/qt-apps/tqtc-qtwebbrowser.git;branch=${BROWSER_BRANCH};protocol=ssh;name=qtwebbrowser;destsuffix=git/basicsuite/qtwebbrowser/tqtc-qtwebbrowser;sdk-uri=5.7/Boot2Qt/sources/b2qt-demos/basicsuite/qtwebbrowser/tqtc-qtwebbrowser \
Expand Down
4 changes: 2 additions & 2 deletions recipes-qt/b2qt-addons/b2qt-launcher.bb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ DESCRIPTION = "Boot to Qt Demo Launcher"
LICENSE = "The-Qt-Company-DCLA-2.1"
LIC_FILES_CHKSUM = "file://src/main.cpp;md5=9320b0d61b46bdd5f27afcc40a0ad77f;beginline=1;endline=17"

inherit qmake5 sdk-sources
inherit qmake5

SRC_URI = " \
git://codereview.qt-project.org/tqtc-boot2qt/launcher;branch=${BRANCH};protocol=ssh;sdk-uri=5.7/Boot2Qt/sources/b2qt-launcher \
git://codereview.qt-project.org/qt-apps/boot2qt-launcher;branch=${BRANCH};protocol=ssh \
file://b2qt-startup.sh \
file://qtlauncher.service \
file://b2qt.service \
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-all.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,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
Expand Down
2 changes: 1 addition & 1 deletion scripts/manifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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://[email protected]/boot2qt" name="playground"/>

<project name="poky"
remote="yocto"
Expand Down
2 changes: 1 addition & 1 deletion scripts/manifest_jethro.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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://[email protected]/boot2qt" name="playground"/>

<project name="poky"
remote="yocto"
Expand Down
8 changes: 4 additions & 4 deletions scripts/setup-environment.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,18 +99,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
Expand Down

0 comments on commit 43c5ae5

Please sign in to comment.