From bb086957d285087b6345b44eb6e30381943af2d6 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Tue, 26 Sep 2017 11:52:32 +0300 Subject: poky, meta-oe: update morty branch layers Update both layers to latest revisions to pull in security fixes, build fixes & other updates. Task-number: QTBUG-63281 Change-Id: I0eb520c336a39833219a61f9a59c7258916aeae2 Reviewed-by: Samuli Piippo --- scripts/manifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/manifest.xml b/scripts/manifest.xml index ab7bdf2..94c9b2a 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -16,11 +16,11 @@ Date: Fri, 8 Sep 2017 08:25:03 +0300 Subject: meta-qt5: update layer - Pull in lots of commits from upstream/master - Update qtglesstream recipe to newer version to fix build break Change-Id: Icd3452fe11c572432f372df288456d688b6ba7fe Reviewed-by: Samuli Piippo --- recipes-qt/qt5-addons/qtglesstream.bb | 2 +- scripts/manifest.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/recipes-qt/qt5-addons/qtglesstream.bb b/recipes-qt/qt5-addons/qtglesstream.bb index 57eae88..bbf3d00 100644 --- a/recipes-qt/qt5-addons/qtglesstream.bb +++ b/recipes-qt/qt5-addons/qtglesstream.bb @@ -38,7 +38,7 @@ SRC_URI = " \ " PV = "1.0.0" -SRCREV = "c11bf065f7630b7800dda157e4bc1aeba7a533d2" +SRCREV = "114e5a1941f831d082395ed80a017f45d3b71a63" BRANCH = "dev" S = "${WORKDIR}/git" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 94c9b2a..660050b 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -24,7 +24,7 @@ path="sources/meta-openembedded"/> Date: Thu, 28 Sep 2017 22:02:43 +0300 Subject: meta-qt5: update meta layer Updates Qt modules to 5.9.2 snapshot 1 Change-Id: Ia798f3cb855484ccb924a9cfcb181b90baebac04 Reviewed-by: Samuli Piippo --- 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 660050b..4de45d2 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -24,7 +24,7 @@ path="sources/meta-openembedded"/> Date: Fri, 29 Sep 2017 09:48:03 +0300 Subject: Add generic qemuarmv7 machine config To be used in Qt CI builds Task-number: QTQAINFRA-1457 Change-Id: I7ef21aa05c65f50539e2f70b21da375a9b3eea02 Reviewed-by: Sami Nurmenniemi --- conf/machine/qemuarmv7.conf | 8 ++++++++ scripts/upload.sh | 1 + 2 files changed, 9 insertions(+) create mode 100644 conf/machine/qemuarmv7.conf (limited to 'scripts') diff --git a/conf/machine/qemuarmv7.conf b/conf/machine/qemuarmv7.conf new file mode 100644 index 0000000..530f802 --- /dev/null +++ b/conf/machine/qemuarmv7.conf @@ -0,0 +1,8 @@ +#@TYPE: Machine +#@NAME: generic armv machine +#@DESCRIPTION: Machine configuration for running a generic armv7 + +DEFAULTTUNE = "armv7athf-neon" + +require conf/machine/include/qemu.inc +require conf/machine/include/arm/arch-armv7a.inc diff --git a/scripts/upload.sh b/scripts/upload.sh index 4f4e1a8..e77f96d 100755 --- a/scripts/upload.sh +++ b/scripts/upload.sh @@ -37,6 +37,7 @@ UPLOADS="\ tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \ tmp/deploy/sdk/b2qt-x86_64-meta-toolchain-b2qt-${PROJECT}-qt5-sdk-${MACHINE}.sh \ tmp/deploy/sdk/b2qt-i686-mingw32-meta-toolchain-b2qt-${PROJECT}-qt5-sdk-${MACHINE}.7z \ + tmp/deploy/sdk/b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-${MACHINE}.sh \ " for f in ${UPLOADS}; do -- cgit v1.2.3-54-g00ecf From 893105e4e47cbd27362d2bb712518d047d40f947 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 2 Oct 2017 09:59:20 +0300 Subject: meta-qt5: update to 5.9.2 RC * Update meta-qt5 layer to 5.9.2 RC * Keep qtsystems module in the old revision. Updating it requires lots of changes to emulator related recipes due API & other changes in qtsimulator module Change-Id: I679d8f45df474d8a14c989d51e0862255651e079 Reviewed-by: Samuli Piippo --- recipes-qt/qt5/qtsystems_git.bbappend | 4 +++- scripts/manifest.xml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/recipes-qt/qt5/qtsystems_git.bbappend b/recipes-qt/qt5/qtsystems_git.bbappend index 2a949eb..57c8285 100644 --- a/recipes-qt/qt5/qtsystems_git.bbappend +++ b/recipes-qt/qt5/qtsystems_git.bbappend @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2017 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -29,3 +29,5 @@ EXTRA_QMAKEVARS_PRE_append_emulator = " CONFIG+=simulator" DEPENDS_append_emulator = " qtsimulator" + +SRCREV = "434af789f0d56ca7a521ca2d9ec8cf3b1057fd37" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 4de45d2..d2257ac 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -24,7 +24,7 @@ path="sources/meta-openembedded"/> Date: Wed, 4 Oct 2017 10:20:45 +0300 Subject: qt5: update qtx11extras submodule & quickcompiler revision Update 5.9.2 RC content with missing changefile & doc updates Change-Id: Ib42c88d565870607fdc1017016692e3f2b66e964 Reviewed-by: Samuli Piippo --- recipes-qt/qt5/qtquickcompiler_git.bb | 4 ++-- scripts/manifest.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb index c5b6ef2..be10a78 100644 --- a/recipes-qt/qt5/qtquickcompiler_git.bb +++ b/recipes-qt/qt5/qtquickcompiler_git.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2017 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -37,7 +37,7 @@ SRC_URI = " \ git://codereview.qt-project.org/qt/tqtc-qmlcompiler;nobranch=1;protocol=ssh \ " -SRCREV = "0203d381423a6423bf8816905f08d65e6f0755b7" +SRCREV = "dd96b1d76162d719f9ba572d2c4659f7bcd47710" S = "${WORKDIR}/git" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index d2257ac..439bcfa 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -24,7 +24,7 @@ path="sources/meta-openembedded"/>