summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@theqtcompany.com>2015-10-14 13:07:44 +0300
committerSamuli Piippo <samuli.piippo@theqtcompany.com>2015-10-14 13:26:34 +0300
commitd63820dd03b527ee09141c636e474d9ceff7545b (patch)
treeae6b50d7dfbb8b3aae697a7d2a18518c35ae06ba
parent87a7f6539f6bd00087f6aaf3a2514054069bbd87 (diff)
parenta8c49af2fa8e64dd6f913d597eb3ac2611c966b4 (diff)
downloadmeta-boot2qt-d63820dd03b527ee09141c636e474d9ceff7545b.tar.gz
Merge remote-tracking branch 'origin/dizzy' into dev
* origin/dizzy: Patch and update ostree Build nativesdk-ostree gstreamer: fix audio volume plugin Revert "toradex: move to V2.4 branch" Add ostree, dracut and libgsystem recipes. otf-noto: update url and add correct license qt5: add workaround for gcc's internal compiler error Use 5.5.1 branch for meta-qt5 qt5: use the new base bbclass to get qt.conf generated qt5-addons: update source revisions b2qt-addons: update source revisions Fix font file access rights Change-Id: Iea75ad7f958e2ae72e6d40ff35dd8b669d4730ce
-rw-r--r--conf/bblayers.conf.bbb.sample1
-rw-r--r--conf/bblayers.conf.emulator.sample1
-rw-r--r--conf/bblayers.conf.fsl.sample1
-rw-r--r--conf/bblayers.conf.rpi.sample1
-rw-r--r--conf/bblayers.conf.ti.sample1
-rw-r--r--conf/bblayers.conf.tibidabo.sample1
-rw-r--r--conf/bblayers.conf.toradex.sample1
-rw-r--r--recipes-qt/b2qt-addons/b2qt-appcontroller.bb4
-rw-r--r--recipes-qt/b2qt-addons/b2qt-demos.bb10
-rw-r--r--recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb2
-rw-r--r--recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb2
-rw-r--r--recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb2
-rw-r--r--recipes-qt/b2qt-addons/b2qt-launcher.bb2
-rw-r--r--recipes-qt/b2qt-addons/b2qt-utils.bb4
-rw-r--r--recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb2
-rw-r--r--recipes-qt/qt5-addons/qtquick2drenderer.bb4
-rw-r--r--recipes-qt/qt5-addons/qtquickcompiler_3.0.bb11
-rw-r--r--recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb10
-rw-r--r--recipes-qt/qt5/qtbase/0001-qdoc-workaround-for-gcc-s-ICE.patch29
-rw-r--r--recipes-qt/qt5/qtbase_%.bbappend1
-rw-r--r--recipes/dracut/dracut_git.bbappend2
-rw-r--r--recipes/e2fsprogs/e2fsprogs_%.bbappend1
-rw-r--r--recipes/fonts/otf-noto.bb13
-rw-r--r--recipes/fonts/ttf-devanagari_2.94.0.bb4
-rw-r--r--recipes/fonts/ttf-opensans.bb2
-rw-r--r--recipes/glib-networking/glib-networking_%.bbappend1
-rw-r--r--recipes/gpgme/gpgme_%.bbappend1
-rw-r--r--recipes/gstreamer/gst-plugins-base/fix-gstvolume.patch23
-rw-r--r--recipes/gstreamer/gst-plugins-base_0.10.%.bbappend25
-rw-r--r--recipes/gstreamer/gstreamer1.0-plugins-base/fix-gstvolume.patch23
-rw-r--r--recipes/gstreamer/gstreamer1.0-plugins-base_%.bbappend25
-rw-r--r--recipes/libassuan/libassuan_%.bbappend1
-rw-r--r--recipes/libgpg-error/libgpg-error_%.bbappend1
-rw-r--r--recipes/libgsystem/libgsystem.bb43
-rw-r--r--recipes/libsoup/libsoup-%.bbappend2
-rw-r--r--recipes/ostree/ostree.bb55
-rw-r--r--recipes/ostree/ostree/0001-Don-t-require-boot-uEnv.txt-for-u-boot-support.patch62
-rw-r--r--recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb1
-rw-r--r--recipes/packagegroup/packagegroup-b2qt-embedded-base.bb2
-rw-r--r--recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb1
-rw-r--r--scripts/manifest_qt5.xml2
41 files changed, 339 insertions, 41 deletions
diff --git a/conf/bblayers.conf.bbb.sample b/conf/bblayers.conf.bbb.sample
index e2d95d3..8a0007c 100644
--- a/conf/bblayers.conf.bbb.sample
+++ b/conf/bblayers.conf.bbb.sample
@@ -36,6 +36,7 @@ BBLAYERS ?= " \
36 ${BSPDIR}/sources/meta-openembedded/meta-oe \ 36 ${BSPDIR}/sources/meta-openembedded/meta-oe \
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-qt5 \ 40 ${BSPDIR}/sources/meta-qt5 \
40 ${BSPDIR}/sources/meta-openembedded/meta-ruby \ 41 ${BSPDIR}/sources/meta-openembedded/meta-ruby \
41 ${BSPDIR}/sources/meta-b2qt \ 42 ${BSPDIR}/sources/meta-b2qt \
diff --git a/conf/bblayers.conf.emulator.sample b/conf/bblayers.conf.emulator.sample
index 1e65b47..dcc0a8f 100644
--- a/conf/bblayers.conf.emulator.sample
+++ b/conf/bblayers.conf.emulator.sample
@@ -34,6 +34,7 @@ BBLAYERS ?= " \
34 ${BSPDIR}/sources/meta-openembedded/meta-oe \ 34 ${BSPDIR}/sources/meta-openembedded/meta-oe \
35 ${BSPDIR}/sources/meta-openembedded/meta-python \ 35 ${BSPDIR}/sources/meta-openembedded/meta-python \
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-qt5 \ 38 ${BSPDIR}/sources/meta-qt5 \
38 ${BSPDIR}/sources/meta-openembedded/meta-ruby \ 39 ${BSPDIR}/sources/meta-openembedded/meta-ruby \
39 ${BSPDIR}/sources/meta-b2qt \ 40 ${BSPDIR}/sources/meta-b2qt \
diff --git a/conf/bblayers.conf.fsl.sample b/conf/bblayers.conf.fsl.sample
index 71c3a2f..5855b60 100644
--- a/conf/bblayers.conf.fsl.sample
+++ b/conf/bblayers.conf.fsl.sample
@@ -36,6 +36,7 @@ BBLAYERS ?= " \
36 ${BSPDIR}/sources/meta-openembedded/meta-oe \ 36 ${BSPDIR}/sources/meta-openembedded/meta-oe \
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-qt5 \ 40 ${BSPDIR}/sources/meta-qt5 \
40 ${BSPDIR}/sources/meta-openembedded/meta-ruby \ 41 ${BSPDIR}/sources/meta-openembedded/meta-ruby \
41 ${BSPDIR}/sources/meta-b2qt \ 42 ${BSPDIR}/sources/meta-b2qt \
diff --git a/conf/bblayers.conf.rpi.sample b/conf/bblayers.conf.rpi.sample
index 2cee63a..03e1412 100644
--- a/conf/bblayers.conf.rpi.sample
+++ b/conf/bblayers.conf.rpi.sample
@@ -35,6 +35,7 @@ BBLAYERS ?= " \
35 ${BSPDIR}/sources/meta-openembedded/meta-oe \ 35 ${BSPDIR}/sources/meta-openembedded/meta-oe \
36 ${BSPDIR}/sources/meta-openembedded/meta-python \ 36 ${BSPDIR}/sources/meta-openembedded/meta-python \
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-qt5 \ 39 ${BSPDIR}/sources/meta-qt5 \
39 ${BSPDIR}/sources/meta-openembedded/meta-ruby \ 40 ${BSPDIR}/sources/meta-openembedded/meta-ruby \
40 ${BSPDIR}/sources/meta-b2qt \ 41 ${BSPDIR}/sources/meta-b2qt \
diff --git a/conf/bblayers.conf.ti.sample b/conf/bblayers.conf.ti.sample
index be4d670..d9f3d5d 100644
--- a/conf/bblayers.conf.ti.sample
+++ b/conf/bblayers.conf.ti.sample
@@ -35,6 +35,7 @@ BBLAYERS ?= " \
35 ${BSPDIR}/sources/meta-openembedded/meta-oe \ 35 ${BSPDIR}/sources/meta-openembedded/meta-oe \
36 ${BSPDIR}/sources/meta-openembedded/meta-python \ 36 ${BSPDIR}/sources/meta-openembedded/meta-python \
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-qt5 \ 39 ${BSPDIR}/sources/meta-qt5 \
39 ${BSPDIR}/sources/meta-openembedded/meta-ruby \ 40 ${BSPDIR}/sources/meta-openembedded/meta-ruby \
40 ${BSPDIR}/sources/meta-b2qt \ 41 ${BSPDIR}/sources/meta-b2qt \
diff --git a/conf/bblayers.conf.tibidabo.sample b/conf/bblayers.conf.tibidabo.sample
index e827ae3..4f6ddee 100644
--- a/conf/bblayers.conf.tibidabo.sample
+++ b/conf/bblayers.conf.tibidabo.sample
@@ -37,6 +37,7 @@ BBLAYERS ?= " \
37 ${BSPDIR}/sources/meta-openembedded/meta-oe \ 37 ${BSPDIR}/sources/meta-openembedded/meta-oe \
38 ${BSPDIR}/sources/meta-openembedded/meta-python \ 38 ${BSPDIR}/sources/meta-openembedded/meta-python \
39 ${BSPDIR}/sources/meta-openembedded/meta-networking \ 39 ${BSPDIR}/sources/meta-openembedded/meta-networking \
40 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
40 ${BSPDIR}/sources/meta-qt5 \ 41 ${BSPDIR}/sources/meta-qt5 \
41 ${BSPDIR}/sources/meta-b2qt \ 42 ${BSPDIR}/sources/meta-b2qt \
42 ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \ 43 ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \
diff --git a/conf/bblayers.conf.toradex.sample b/conf/bblayers.conf.toradex.sample
index d470daa..76f641f 100644
--- a/conf/bblayers.conf.toradex.sample
+++ b/conf/bblayers.conf.toradex.sample
@@ -37,6 +37,7 @@ BBLAYERS ?= " \
37 ${BSPDIR}/sources/meta-openembedded/meta-oe \ 37 ${BSPDIR}/sources/meta-openembedded/meta-oe \
38 ${BSPDIR}/sources/meta-openembedded/meta-python \ 38 ${BSPDIR}/sources/meta-openembedded/meta-python \
39 ${BSPDIR}/sources/meta-openembedded/meta-networking \ 39 ${BSPDIR}/sources/meta-openembedded/meta-networking \
40 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
40 ${BSPDIR}/sources/meta-qt5 \ 41 ${BSPDIR}/sources/meta-qt5 \
41 ${BSPDIR}/sources/meta-openembedded/meta-ruby \ 42 ${BSPDIR}/sources/meta-openembedded/meta-ruby \
42 ${BSPDIR}/sources/meta-b2qt \ 43 ${BSPDIR}/sources/meta-b2qt \
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
index 6766978..ef7108f 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
+++ b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
@@ -31,8 +31,8 @@ SRC_URI = " \
31 file://appcontroller.conf \ 31 file://appcontroller.conf \
32 " 32 "
33 33
34SRCREV = "45d549fe274cd8f16578b2ff9a34af40fd9b98a9" 34SRCREV = "7ac47bee4c6bd55df8c0cad14ff11457fbf07158"
35BRANCH = "dev" 35BRANCH = "5.5"
36 36
37S = "${WORKDIR}/git" 37S = "${WORKDIR}/git"
38 38
diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb
index 9ceab8c..21ceffc 100644
--- a/recipes-qt/b2qt-addons/b2qt-demos.bb
+++ b/recipes-qt/b2qt-addons/b2qt-demos.bb
@@ -33,12 +33,12 @@ SRC_URI = " \
33 git://code.qt.io/qt/qtquickcontrols.git;branch=${QT_BRANCH};protocol=git;name=qtquickcontrols;destsuffix=qtquickcontrols \ 33 git://code.qt.io/qt/qtquickcontrols.git;branch=${QT_BRANCH};protocol=git;name=qtquickcontrols;destsuffix=qtquickcontrols \
34 " 34 "
35 35
36BRANCH = "dev" 36BRANCH = "5.5"
37QT_BRANCH = "5.5" 37QT_BRANCH = "5.5.1"
38SRCREV_demos = "de50ff5dbf2f789786e25540ba0b0efc8c68e0f9" 38SRCREV_demos = "017d5d428688ca78220e073c393df27936545f14"
39SRCREV_everywhere = "6178748a6ea34df40a8e3c9ce67137e33383bb0e" 39SRCREV_everywhere = "6178748a6ea34df40a8e3c9ce67137e33383bb0e"
40SRCREV_qtcanvas3d = "debe68a85b571b70e2fe0824e5ed40484a72c216" 40SRCREV_qtcanvas3d = "e372a67c1bbdf695f8e550950a3dbf3106389479"
41SRCREV_qtquickcontrols = "b4dc4a98d5deffbbb30f7011f6c0d3d10f430b98" 41SRCREV_qtquickcontrols = "f770dbe9d38214a37e12adb591498dcd1ad0293e"
42 42
43 43
44S = "${WORKDIR}/git/basicsuite" 44S = "${WORKDIR}/git/basicsuite"
diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb b/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb
index e082735..15fe3c0 100644
--- a/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb
+++ b/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb
@@ -31,7 +31,7 @@ SRC_URI = " \
31 file://emulatorproxyd.sh \ 31 file://emulatorproxyd.sh \
32 " 32 "
33 33
34SRCREV = "1d001910d45349ae2a44fa01516baaa7ff4c9eda" 34SRCREV = "89ca944fae7106a55803ddce6fd84447685b61e5"
35BRANCH = "master" 35BRANCH = "master"
36 36
37S = "${WORKDIR}/git/src/helperlibs/proxy" 37S = "${WORKDIR}/git/src/helperlibs/proxy"
diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb b/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb
index d59ba2c..622363d 100644
--- a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb
+++ b/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb
@@ -31,7 +31,7 @@ SRC_URI = " \
31 file://sdcardmountd.sh \ 31 file://sdcardmountd.sh \
32 " 32 "
33 33
34SRCREV = "1d001910d45349ae2a44fa01516baaa7ff4c9eda" 34SRCREV = "89ca944fae7106a55803ddce6fd84447685b61e5"
35BRANCH = "master" 35BRANCH = "master"
36 36
37S = "${WORKDIR}/git/src/helperlibs/sdcarddaemon" 37S = "${WORKDIR}/git/src/helperlibs/sdcarddaemon"
diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb b/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb
index dd5637f..221816e 100644
--- a/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb
+++ b/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb
@@ -30,7 +30,7 @@ SRC_URI = " \
30 git://codereview.qt-project.org/tqtc-boot2qt/emulator;branch=${BRANCH};protocol=ssh \ 30 git://codereview.qt-project.org/tqtc-boot2qt/emulator;branch=${BRANCH};protocol=ssh \
31 " 31 "
32 32
33SRCREV = "1d001910d45349ae2a44fa01516baaa7ff4c9eda" 33SRCREV = "89ca944fae7106a55803ddce6fd84447685b61e5"
34BRANCH = "master" 34BRANCH = "master"
35 35
36EXTRA_QMAKEVARS_PRE += "CONFIG+=force_independent" 36EXTRA_QMAKEVARS_PRE += "CONFIG+=force_independent"
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb
index 7781031..98de916 100644
--- a/recipes-qt/b2qt-addons/b2qt-launcher.bb
+++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb
@@ -32,7 +32,7 @@ SRC_URI = " \
32 " 32 "
33 33
34SRCREV = "e824e206f28eb20bcb6f1d9064990f5e927261f4" 34SRCREV = "e824e206f28eb20bcb6f1d9064990f5e927261f4"
35BRANCH = "dev" 35BRANCH = "5.5"
36 36
37S = "${WORKDIR}/git" 37S = "${WORKDIR}/git"
38 38
diff --git a/recipes-qt/b2qt-addons/b2qt-utils.bb b/recipes-qt/b2qt-addons/b2qt-utils.bb
index e438587..81a5b60 100644
--- a/recipes-qt/b2qt-addons/b2qt-utils.bb
+++ b/recipes-qt/b2qt-addons/b2qt-utils.bb
@@ -30,8 +30,8 @@ SRC_URI = " \
30 git://codereview.qt-project.org/tqtc-boot2qt/utils;branch=${BRANCH};protocol=ssh;sdk-uri=5.5/Boot2Qt/sources/b2qt-utils \ 30 git://codereview.qt-project.org/tqtc-boot2qt/utils;branch=${BRANCH};protocol=ssh;sdk-uri=5.5/Boot2Qt/sources/b2qt-utils \
31 " 31 "
32 32
33SRCREV = "602034c3a71c53d050e67101e070185cbcf7ccee" 33SRCREV = "ae6f34543b8336ad5a202916ee42a2d2bd00bfe7"
34BRANCH = "dev" 34BRANCH = "5.5"
35 35
36S = "${WORKDIR}/git" 36S = "${WORKDIR}/git"
37 37
diff --git a/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb b/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb
index 45d3148..d92c277 100644
--- a/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb
+++ b/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb
@@ -25,7 +25,7 @@ PR = "r0"
25LICENSE = "QtEnterprise" 25LICENSE = "QtEnterprise"
26LIC_FILES_CHKSUM = "file://${QT_LICENCE};md5=7bc9c54e450006250a60e96604c186c9" 26LIC_FILES_CHKSUM = "file://${QT_LICENCE};md5=7bc9c54e450006250a60e96604c186c9"
27 27
28inherit populate_sdk populate_sdk_qt5 qmake5_paths 28inherit populate_sdk populate_sdk_qt5_base
29 29
30TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host" 30TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host"
31TOOLCHAIN_TARGET_TASK += "packagegroup-b2qt-embedded-qt5-toolchain-target" 31TOOLCHAIN_TARGET_TASK += "packagegroup-b2qt-embedded-qt5-toolchain-target"
diff --git a/recipes-qt/qt5-addons/qtquick2drenderer.bb b/recipes-qt/qt5-addons/qtquick2drenderer.bb
index 24aff5c..13b6b72 100644
--- a/recipes-qt/qt5-addons/qtquick2drenderer.bb
+++ b/recipes-qt/qt5-addons/qtquick2drenderer.bb
@@ -30,8 +30,8 @@ SRC_URI = " \
30 git://qt-gerrit.ci.local/QtRD-15810/scenegraph-raster.git;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/QtQuick2DRenderer/1.1/Src \ 30 git://qt-gerrit.ci.local/QtRD-15810/scenegraph-raster.git;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/QtQuick2DRenderer/1.1/Src \
31 " 31 "
32 32
33# v1.1 33# v1.1.1
34SRCREV = "97c310f3a18a5aaebf8c102ceaba1f6a093faf6b" 34SRCREV = "d7de74d6e608fbbd36fc9abad27fa82d095cb692"
35BRANCH = "master" 35BRANCH = "master"
36 36
37S = "${WORKDIR}/git" 37S = "${WORKDIR}/git"
diff --git a/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb b/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb
index 6f9fa30..9c3d43b 100644
--- a/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb
+++ b/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb
@@ -27,15 +27,12 @@ LIC_FILES_CHKSUM = "file://compiler/qtquickcompiler.h;md5=553f8ee8d120874969caca
27inherit qt5-module 27inherit qt5-module
28 28
29SRC_URI = " \ 29SRC_URI = " \
30 git://qt-gerrit.ci.local/QtRD-15810/qmlcompiler.git;branch=${BRANCH};protocol=ssh;name=compiler;destsuffix=git \ 30 git://qt-gerrit.ci.local/QtRD-15810/qmlcompiler.git;branch=${BRANCH};protocol=ssh;destsuffix=git \
31 git://qt-gerrit.ci.local/QtRD-15810/qtsdk-enterprise.git;branch=${BRANCH};protocol=ssh;name=sdk;destsuffix=git/compiler/license-checker \
32 " 31 "
33 32
34SRCREV_compiler = "cc3b348065e84242d772d53b5f9dcad88b0da33e" 33# v3.0.0
35BRANCH_compiler = "3.0" 34SRCREV = "7e29e55c8315cc5e944505f13c24893d0f54efeb"
36 35BRANCH = "3.0"
37SRCREV_sdk = "60cb1a7763b670108b17c7e1345394e424153bea"
38BRANCH_sdk = "master"
39 36
40S = "${WORKDIR}/git" 37S = "${WORKDIR}/git"
41 38
diff --git a/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb b/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb
index 036a938..e1aa642 100644
--- a/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb
+++ b/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb
@@ -30,16 +30,12 @@ SRC_URI = " \
30 git://codereview.qt-project.org/qt/tqtc-qtvirtualkeyboard;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/QtVirtualKeyboard/1.3/Src \ 30 git://codereview.qt-project.org/qt/tqtc-qtvirtualkeyboard;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/QtVirtualKeyboard/1.3/Src \
31 " 31 "
32 32
33# v1.3.0 33# v1.3.1
34SRCREV = "ad517b66fc4aadb2807951f182552a1b161d9c95" 34SRCREV = "567e2c1d3df5a841160b2c24a390f153b25ad368"
35BRANCH = "master" 35BRANCH = "1.3"
36 36
37S = "${WORKDIR}/git" 37S = "${WORKDIR}/git"
38 38
39DEPENDS = "qtbase qtdeclarative hunspell" 39DEPENDS = "qtbase qtdeclarative hunspell"
40 40
41EXTRA_QMAKEVARS_PRE += "CONFIG+=disable-desktop" 41EXTRA_QMAKEVARS_PRE += "CONFIG+=disable-desktop"
42
43FILES_${PN}-qmlplugins-dbg = " \
44 ${OE_QMAKE_PATH_QML}/QtQuick/Enterprise/VirtualKeyboard/Styles/.debug/* \
45 "
diff --git a/recipes-qt/qt5/qtbase/0001-qdoc-workaround-for-gcc-s-ICE.patch b/recipes-qt/qt5/qtbase/0001-qdoc-workaround-for-gcc-s-ICE.patch
new file mode 100644
index 0000000..85e569f
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0001-qdoc-workaround-for-gcc-s-ICE.patch
@@ -0,0 +1,29 @@
1From 75840ad8b40068b70792a27f1fdc7cccf3d28f7c Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@theqtcompany.com>
3Date: Wed, 16 Sep 2015 13:30:38 +0300
4Subject: [PATCH] qdoc: workaround for gcc's ICE
5
6Remove c++11 option from compilation to prevent gcc's internal compiler error:
7in add_stores, at var-tracking.c:6000
8
9Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
10---
11 src/tools/qdoc/qdoc.pro | 2 ++
12 1 file changed, 2 insertions(+)
13
14diff --git a/src/tools/qdoc/qdoc.pro b/src/tools/qdoc/qdoc.pro
15index f0df113..a847482 100644
16--- a/src/tools/qdoc/qdoc.pro
17+++ b/src/tools/qdoc/qdoc.pro
18@@ -4,6 +4,8 @@
19 requires(!contains(QT_DISABLED_FEATURES, dom))
20 }
21
22+QMAKE_CXXFLAGS_CXX11 =
23+
24 option(host_build)
25 QT = core xml
26
27--
281.9.1
29
diff --git a/recipes-qt/qt5/qtbase_%.bbappend b/recipes-qt/qt5/qtbase_%.bbappend
index 8865a69..6ce74b2 100644
--- a/recipes-qt/qt5/qtbase_%.bbappend
+++ b/recipes-qt/qt5/qtbase_%.bbappend
@@ -39,6 +39,7 @@ FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
39 39
40SRC_URI += " \ 40SRC_URI += " \
41 file://oe-device-extra.pri \ 41 file://oe-device-extra.pri \
42 file://0001-qdoc-workaround-for-gcc-s-ICE.patch \
42 " 43 "
43 44
44do_configure_prepend() { 45do_configure_prepend() {
diff --git a/recipes/dracut/dracut_git.bbappend b/recipes/dracut/dracut_git.bbappend
new file mode 100644
index 0000000..479e407
--- /dev/null
+++ b/recipes/dracut/dracut_git.bbappend
@@ -0,0 +1,2 @@
1# Upstream recipe mistakenly depends on systemd, we remove that dependency here.
2RDEPENDS_${PN}_remove = "systemd"
diff --git a/recipes/e2fsprogs/e2fsprogs_%.bbappend b/recipes/e2fsprogs/e2fsprogs_%.bbappend
new file mode 100644
index 0000000..608377e
--- /dev/null
+++ b/recipes/e2fsprogs/e2fsprogs_%.bbappend
@@ -0,0 +1 @@
BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes/fonts/otf-noto.bb b/recipes/fonts/otf-noto.bb
index c207535..fc26e1a 100644
--- a/recipes/fonts/otf-noto.bb
+++ b/recipes/fonts/otf-noto.bb
@@ -1,22 +1,21 @@
1SUMMARY = "Noto Sans CJK" 1SUMMARY = "Noto Sans CJK"
2SECTION = "fonts" 2SECTION = "fonts"
3HOMEPAGE = "http://www.google.com/get/noto" 3HOMEPAGE = "http://www.google.com/get/noto"
4LICENSE = "Apache-2.0" 4LICENSE = "OFL-1.1"
5# see https://code.google.com/p/noto/issues/detail?id=331 5LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE_CJK.txt;md5=55719faa0112708e946b820b24b14097"
6LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
7 6
8INHIBIT_DEFAULT_DEPS = "1" 7INHIBIT_DEFAULT_DEPS = "1"
9 8
10inherit allarch fontcache 9inherit allarch fontcache
11 10
12PV = "1.004" 11PV = "1.004"
13SRC_URI = "http://www.google.com/get/noto/pkgs/NotoSansCJKSC-hinted.zip" 12SRC_URI = "https://noto-website.storage.googleapis.com/pkgs/NotoSansCJKSC-hinted.zip"
14 13
15SRC_URI[md5sum] = "dc40e8af0b0178451ccc301f1d41e726" 14SRC_URI[md5sum] = "c0fa6153aa826ee96041ba4470a1f51f"
16SRC_URI[sha256sum] = "25143bb803ebb20fd17ffd1299012ee2f3a929182ff0700ab656c181872413a4" 15SRC_URI[sha256sum] = "31459f6d8c36a1136bec3f8d720b2b637e4dded681b7bb610186c9986be25848"
17 16
18do_install() { 17do_install() {
19 install -m 0644 -d ${D}${datadir}/fonts/otf/noto 18 install -m 0755 -d ${D}${datadir}/fonts/otf/noto
20 install -m 0644 ${WORKDIR}/*.otf ${D}${datadir}/fonts/otf/noto 19 install -m 0644 ${WORKDIR}/*.otf ${D}${datadir}/fonts/otf/noto
21} 20}
22 21
diff --git a/recipes/fonts/ttf-devanagari_2.94.0.bb b/recipes/fonts/ttf-devanagari_2.94.0.bb
index 69e66c8..f945c82 100644
--- a/recipes/fonts/ttf-devanagari_2.94.0.bb
+++ b/recipes/fonts/ttf-devanagari_2.94.0.bb
@@ -14,8 +14,8 @@ SRC_URI[md5sum] = "57527ee536a18b443cf786d4b8fd5ec8"
14SRC_URI[sha256sum] = "a6618aeb1d25df46d3c22e528c38ea1d1147654e19904497a1e97f4684c55353" 14SRC_URI[sha256sum] = "a6618aeb1d25df46d3c22e528c38ea1d1147654e19904497a1e97f4684c55353"
15 15
16do_install() { 16do_install() {
17 install -m 0644 -d ${D}${datadir}/fonts/truetype/lohit 17 install -m 0755 -d ${D}${datadir}/fonts/truetype/lohit
18 install -m 0644 -d ${D}${sysconfdir}/fonts/conf.d/ 18 install -m 0755 -d ${D}${sysconfdir}/fonts/conf.d/
19 install -m 0644 ${WORKDIR}/lohit-devanagari-ttf-${PV}/66-lohit-devanagari.conf ${D}${sysconfdir}/fonts/conf.d/ 19 install -m 0644 ${WORKDIR}/lohit-devanagari-ttf-${PV}/66-lohit-devanagari.conf ${D}${sysconfdir}/fonts/conf.d/
20 install -m 0644 ${WORKDIR}/lohit-devanagari-ttf-${PV}/Lohit-Devanagari.ttf ${D}${datadir}/fonts/truetype/lohit 20 install -m 0644 ${WORKDIR}/lohit-devanagari-ttf-${PV}/Lohit-Devanagari.ttf ${D}${datadir}/fonts/truetype/lohit
21} 21}
diff --git a/recipes/fonts/ttf-opensans.bb b/recipes/fonts/ttf-opensans.bb
index ad40b81..d115219 100644
--- a/recipes/fonts/ttf-opensans.bb
+++ b/recipes/fonts/ttf-opensans.bb
@@ -13,7 +13,7 @@ SRC_URI = "https://www.google.com/fonts/download?kit=3hvsV99qyKCBS55e5pvb3ltkqrI
13BB_STRICT_CHECKSUM = "" 13BB_STRICT_CHECKSUM = ""
14 14
15do_install() { 15do_install() {
16 install -m 0644 -d ${D}${datadir}/fonts/truetype/opensans 16 install -m 0755 -d ${D}${datadir}/fonts/truetype/opensans
17 install -m 0644 ${WORKDIR}/*.ttf ${D}${datadir}/fonts/truetype/opensans 17 install -m 0644 ${WORKDIR}/*.ttf ${D}${datadir}/fonts/truetype/opensans
18} 18}
19 19
diff --git a/recipes/glib-networking/glib-networking_%.bbappend b/recipes/glib-networking/glib-networking_%.bbappend
new file mode 100644
index 0000000..608377e
--- /dev/null
+++ b/recipes/glib-networking/glib-networking_%.bbappend
@@ -0,0 +1 @@
BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes/gpgme/gpgme_%.bbappend b/recipes/gpgme/gpgme_%.bbappend
new file mode 100644
index 0000000..608377e
--- /dev/null
+++ b/recipes/gpgme/gpgme_%.bbappend
@@ -0,0 +1 @@
BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes/gstreamer/gst-plugins-base/fix-gstvolume.patch b/recipes/gstreamer/gst-plugins-base/fix-gstvolume.patch
new file mode 100644
index 0000000..d229e95
--- /dev/null
+++ b/recipes/gstreamer/gst-plugins-base/fix-gstvolume.patch
@@ -0,0 +1,23 @@
1diff --git a/gst/volume/gstvolume.c b/gst/volume/gstvolume.c
2index 0f5b362..94d03a3 100644
3--- a/gst/volume/gstvolume.c
4+++ b/gst/volume/gstvolume.c
5@@ -314,10 +314,14 @@ volume_update_volume (GstVolume * self, gfloat volume,
6 self->current_mute = FALSE;
7 self->current_volume = volume;
8
9- self->current_vol_i8 = volume * VOLUME_UNITY_INT8;
10- self->current_vol_i16 = volume * VOLUME_UNITY_INT16;
11- self->current_vol_i24 = volume * VOLUME_UNITY_INT24;
12- self->current_vol_i32 = volume * VOLUME_UNITY_INT32;
13+ self->current_vol_i8 =
14+ (gint) ((gdouble) volume * (gdouble) VOLUME_UNITY_INT8);
15+ self->current_vol_i16 =
16+ (gint) ((gdouble) volume * (gdouble) VOLUME_UNITY_INT16);
17+ self->current_vol_i24 =
18+ (gint) ((gdouble) volume * (gdouble) VOLUME_UNITY_INT24);
19+ self->current_vol_i32 =
20+ (gint) ((gdouble) volume * (gdouble) VOLUME_UNITY_INT32);
21
22 passthrough = (self->current_vol_i16 == VOLUME_UNITY_INT16);
23 }
diff --git a/recipes/gstreamer/gst-plugins-base_0.10.%.bbappend b/recipes/gstreamer/gst-plugins-base_0.10.%.bbappend
new file mode 100644
index 0000000..026aa2b
--- /dev/null
+++ b/recipes/gstreamer/gst-plugins-base_0.10.%.bbappend
@@ -0,0 +1,25 @@
1#############################################################################
2##
3## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
4##
5## This file is part of the Qt Enterprise Embedded Scripts of the Qt
6## framework.
7##
8## $QT_BEGIN_LICENSE$
9## Commercial License Usage Only
10## Licensees holding valid commercial Qt license agreements with Digia
11## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
12## may use this file in accordance with the terms contained in said license
13## agreement.
14##
15## For further information use the contact form at
16## http://www.qt.io/contact-us.
17##
18##
19## $QT_END_LICENSE$
20##
21#############################################################################
22
23FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
24
25SRC_URI += "file://fix-gstvolume.patch"
diff --git a/recipes/gstreamer/gstreamer1.0-plugins-base/fix-gstvolume.patch b/recipes/gstreamer/gstreamer1.0-plugins-base/fix-gstvolume.patch
new file mode 100644
index 0000000..f67a840
--- /dev/null
+++ b/recipes/gstreamer/gstreamer1.0-plugins-base/fix-gstvolume.patch
@@ -0,0 +1,23 @@
1diff --git a/gst/volume/gstvolume.c b/gst/volume/gstvolume.c
2index 0f5b362..94d03a3 100644
3--- a/gst/volume/gstvolume.c
4+++ b/gst/volume/gstvolume.c
5@@ -250,10 +250,14 @@ volume_update_volume (GstVolume * self, const GstAudioInfo * info,
6 self->current_mute = FALSE;
7 self->current_volume = volume;
8
9- self->current_vol_i8 = volume * VOLUME_UNITY_INT8;
10- self->current_vol_i16 = volume * VOLUME_UNITY_INT16;
11- self->current_vol_i24 = volume * VOLUME_UNITY_INT24;
12- self->current_vol_i32 = volume * VOLUME_UNITY_INT32;
13+ self->current_vol_i8 =
14+ (gint) ((gdouble) volume * (gdouble) VOLUME_UNITY_INT8);
15+ self->current_vol_i16 =
16+ (gint) ((gdouble) volume * (gdouble) VOLUME_UNITY_INT16);
17+ self->current_vol_i24 =
18+ (gint) ((gdouble) volume * (gdouble) VOLUME_UNITY_INT24);
19+ self->current_vol_i32 =
20+ (gint) ((gdouble) volume * (gdouble) VOLUME_UNITY_INT32);
21
22 passthrough = (self->current_vol_i16 == VOLUME_UNITY_INT16);
23 }
diff --git a/recipes/gstreamer/gstreamer1.0-plugins-base_%.bbappend b/recipes/gstreamer/gstreamer1.0-plugins-base_%.bbappend
new file mode 100644
index 0000000..026aa2b
--- /dev/null
+++ b/recipes/gstreamer/gstreamer1.0-plugins-base_%.bbappend
@@ -0,0 +1,25 @@
1#############################################################################
2##
3## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
4##
5## This file is part of the Qt Enterprise Embedded Scripts of the Qt
6## framework.
7##
8## $QT_BEGIN_LICENSE$
9## Commercial License Usage Only
10## Licensees holding valid commercial Qt license agreements with Digia
11## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
12## may use this file in accordance with the terms contained in said license
13## agreement.
14##
15## For further information use the contact form at
16## http://www.qt.io/contact-us.
17##
18##
19## $QT_END_LICENSE$
20##
21#############################################################################
22
23FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
24
25SRC_URI += "file://fix-gstvolume.patch"
diff --git a/recipes/libassuan/libassuan_%.bbappend b/recipes/libassuan/libassuan_%.bbappend
new file mode 100644
index 0000000..608377e
--- /dev/null
+++ b/recipes/libassuan/libassuan_%.bbappend
@@ -0,0 +1 @@
BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes/libgpg-error/libgpg-error_%.bbappend b/recipes/libgpg-error/libgpg-error_%.bbappend
new file mode 100644
index 0000000..2a59083
--- /dev/null
+++ b/recipes/libgpg-error/libgpg-error_%.bbappend
@@ -0,0 +1 @@
BBCLASSEXTEND += "nativesdk"
diff --git a/recipes/libgsystem/libgsystem.bb b/recipes/libgsystem/libgsystem.bb
new file mode 100644
index 0000000..f006a39
--- /dev/null
+++ b/recipes/libgsystem/libgsystem.bb
@@ -0,0 +1,43 @@
1#############################################################################
2##
3## Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
4##
5## This file is part of the Qt Enterprise Embedded Scripts of the Qt
6## framework.
7##
8## $QT_BEGIN_LICENSE$
9## Commercial License Usage Only
10## Licensees holding valid commercial Qt license agreements with Digia
11## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
12## may use this file in accordance with the terms contained in said license
13## agreement.
14##
15## For further information use the contact form at
16## http://www.qt.io/contact-us.
17##
18##
19## $QT_END_LICENSE$
20##
21#############################################################################
22
23SUMMARY = "LibGSystem is a GIO-based library, targeted primarily for use by operating system components."
24
25LICENSE = "LGPL-2.1"
26LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
27
28inherit autotools pkgconfig
29
30SRC_URI = "gitsm://github.com/GNOME/libgsystem.git;tag=v2015.2;protocol=git"
31S = "${WORKDIR}/git"
32
33DEPENDS = "glib-2.0 attr libcap"
34
35do_configure_prepend() {
36 # Workaround a broken configure.ac. It should check first if GTK_DOC_CHECK
37 # macro is actually defined before trying to use it. For how-to see:
38 # https://developer.gnome.org/gtk-doc-manual/stable/settingup_autoconf.html.en
39 # We get a syntax error since we do not bundle gnome recipes that define this macro.
40 sed -i '/GTK_DOC_CHECK/d' ${S}/configure.ac
41}
42
43BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes/libsoup/libsoup-%.bbappend b/recipes/libsoup/libsoup-%.bbappend
new file mode 100644
index 0000000..4a95767
--- /dev/null
+++ b/recipes/libsoup/libsoup-%.bbappend
@@ -0,0 +1,2 @@
1DEPENDS += "glib-networking"
2BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes/ostree/ostree.bb b/recipes/ostree/ostree.bb
new file mode 100644
index 0000000..96931f1
--- /dev/null
+++ b/recipes/ostree/ostree.bb
@@ -0,0 +1,55 @@
1#############################################################################
2##
3## Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
4##
5## This file is part of the Qt Enterprise Embedded Scripts of the Qt
6## framework.
7##
8## $QT_BEGIN_LICENSE$
9## Commercial License Usage Only
10## Licensees holding valid commercial Qt license agreements with Digia
11## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
12## may use this file in accordance with the terms contained in said license
13## agreement.
14##
15## For further information use the contact form at
16## http://www.qt.io/contact-us.
17##
18##
19## $QT_END_LICENSE$
20##
21#############################################################################
22
23SUMMARY = "Tool for managing bootable, immutable, versioned filesystem trees."
24
25LICENSE = "LGPL-2.1"
26LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
27
28inherit autotools pkgconfig
29
30SRC_URI = " \
31 git://github.com/GNOME/ostree.git;tag=v2015.9 \
32 file://0001-Don-t-require-boot-uEnv.txt-for-u-boot-support.patch \
33 "
34
35S = "${WORKDIR}/git"
36
37DEPENDS = "glib-2.0 e2fsprogs gpgme attr libsoup-2.4 libgsystem libassuan xz"
38
39EXTRA_OECONF = "--with-dracut --without-selinux --without-libarchive --with-grub2=no --enable-gtk-doc-html=no"
40
41do_configure_prepend() {
42 cd ${S}
43 # Update submodules and workaround bugs.
44 env NOCONFIGURE=1 ./autogen.sh
45 cd -
46}
47
48do_install_append() {
49 # Silence installed-vs-shipped error message. We provide our own dracut module.
50 # The only way to force OSTree to build necessary binaries is to pass "--with-dracut",
51 # this of course is a broken configure.ac logic.
52 rm -rf ${D}${libdir}/dracut/
53}
54
55BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes/ostree/ostree/0001-Don-t-require-boot-uEnv.txt-for-u-boot-support.patch b/recipes/ostree/ostree/0001-Don-t-require-boot-uEnv.txt-for-u-boot-support.patch
new file mode 100644
index 0000000..8e1be94
--- /dev/null
+++ b/recipes/ostree/ostree/0001-Don-t-require-boot-uEnv.txt-for-u-boot-support.patch
@@ -0,0 +1,62 @@
1From ca0a0261be6397d5acb7a4fa2a492c5b554fb1fe Mon Sep 17 00:00:00 2001
2From: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
3Date: Tue, 6 Oct 2015 23:43:25 +0200
4Subject: [PATCH] Don't require /boot/uEnv.txt for u-boot support
5
6The current code checks if /boot/uEnv.txt is a symlink to
7decice if sysroot requires u-boot support. Why this is bad:
8
9There are 2 ways to provide a custom env to u-boot from user space:
10
111) A compiled binary that is sourced from u-boot.
122) A text file (usually /uEnv.txt) that is imported into env from u-boot.
13
14The current OSTree u-boot integration code was designed with the 1st
15case in mind.
16
17Many bootscripts provided by an embedded device vendors expect
18to find uEnv.txt in the top level directory, it is often hardcoded
19when building u-boot and is difficult to change later on. Or in other
20cases it is stored in read-only memory so changing it would require
21re-flushing boot loader with a new env. So the issue here is that
22OSTree's and vendor uEnv.txt want to exist on the same path and OSTree
23would throw away any changes added to /uEnv.txt by user on the next
24upgrade/deploy.
25
26This patch "hides" away the OSTree's env file loader/uEnv.txt from users
27who are used to edditing uEnv.txt at the top level directory. Now to add
28OSTree support on such boards you can simply add a custom logic in uEnv.txt
29that loads ostree env from /loader/uEnv.txt
30
31This change is backward compatible with the previous ostree releases and
32solves the issue described in:
33
34https://bugzilla.gnome.org/show_bug.cgi?id=755787
35---
36 src/libostree/ostree-bootloader-uboot.c | 4 ++--
37 1 file changed, 2 insertions(+), 2 deletions(-)
38
39diff --git a/src/libostree/ostree-bootloader-uboot.c b/src/libostree/ostree-bootloader-uboot.c
40index 4c0218f..f67e9bd 100644
41--- a/src/libostree/ostree-bootloader-uboot.c
42+++ b/src/libostree/ostree-bootloader-uboot.c
43@@ -52,7 +52,7 @@ _ostree_bootloader_uboot_query (OstreeBootloader *bootloader,
44 {
45 OstreeBootloaderUboot *self = OSTREE_BOOTLOADER_UBOOT (bootloader);
46
47- *out_is_active = g_file_query_file_type (self->config_path, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL) == G_FILE_TYPE_SYMBOLIC_LINK;
48+ *out_is_active = g_file_query_file_type (self->config_path, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL) == G_FILE_TYPE_REGULAR;
49 return TRUE;
50 }
51
52@@ -177,6 +177,6 @@ _ostree_bootloader_uboot_new (OstreeSysroot *sysroot)
53 {
54 OstreeBootloaderUboot *self = g_object_new (OSTREE_TYPE_BOOTLOADER_UBOOT, NULL);
55 self->sysroot = g_object_ref (sysroot);
56- self->config_path = g_file_resolve_relative_path (self->sysroot->path, "boot/uEnv.txt");
57+ self->config_path = g_file_resolve_relative_path (self->sysroot->path, "boot/loader/uEnv.txt");
58 return self;
59 }
60--
612.1.4
62
diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
index f64c0ac..7591b6b 100644
--- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
+++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
@@ -30,6 +30,7 @@ RDEPENDS_${PN} = "\
30 nativesdk-python-modules \ 30 nativesdk-python-modules \
31 nativesdk-python-misc \ 31 nativesdk-python-misc \
32 nativesdk-gperf \ 32 nativesdk-gperf \
33 nativesdk-ostree \
33 ${@base_contains("DISTRO_FEATURES", "wayland", "nativesdk-wayland", "", d)} \ 34 ${@base_contains("DISTRO_FEATURES", "wayland", "nativesdk-wayland", "", d)} \
34 ${MACHINE_EXTRA_INSTALL_SDK_HOST} \ 35 ${MACHINE_EXTRA_INSTALL_SDK_HOST} \
35 " 36 "
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
index 82e801b..a2d9c72 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
@@ -60,6 +60,8 @@ RDEPENDS_${PN} = "\
60 tzdata-europe \ 60 tzdata-europe \
61 atk \ 61 atk \
62 libevent \ 62 libevent \
63 ostree \
64 dracut \
63 ${@base_contains("DISTRO_FEATURES", "wayland", "wayland weston weston-examples", "", d)} \ 65 ${@base_contains("DISTRO_FEATURES", "wayland", "wayland weston weston-examples", "", d)} \
64 ${MACHINE_EXTRA_INSTALL} \ 66 ${MACHINE_EXTRA_INSTALL} \
65 " 67 "
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb
index b31ea3f..59fa843 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb
@@ -50,6 +50,7 @@ RDEPENDS_${PN} += "\
50 libpq-dev \ 50 libpq-dev \
51 atk-dev \ 51 atk-dev \
52 libevent-dev \ 52 libevent-dev \
53 ostree-dev \
53 ${@base_contains("DISTRO_FEATURES", "wayland", "libwayland-egl-mx6-dev libxkbcommon-dev libgbm-dev libdrm-dev", "", d)} \ 54 ${@base_contains("DISTRO_FEATURES", "wayland", "libwayland-egl-mx6-dev libxkbcommon-dev libgbm-dev libdrm-dev", "", d)} \
54 ${@base_contains("DISTRO_FEATURES", "bluetooth", "bluez4-dev", "", d)} \ 55 ${@base_contains("DISTRO_FEATURES", "bluetooth", "bluez4-dev", "", d)} \
55 ${MACHINE_EXTRA_INSTALL_SDK} \ 56 ${MACHINE_EXTRA_INSTALL_SDK} \
diff --git a/scripts/manifest_qt5.xml b/scripts/manifest_qt5.xml
index 69eb254..1e4f902 100644
--- a/scripts/manifest_qt5.xml
+++ b/scripts/manifest_qt5.xml
@@ -7,7 +7,7 @@
7 7
8 <project name="meta-qt5" 8 <project name="meta-qt5"
9 remote="playground" 9 remote="playground"
10 revision="5.5-next" 10 revision="5.5.1"
11 path="sources/meta-qt5"/> 11 path="sources/meta-qt5"/>
12 12
13</manifest> 13</manifest>