From f775774f21c3edbb73e19031d6d38c603f42f16b Mon Sep 17 00:00:00 2001 From: Samuli Piippo 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 --- conf/distro/b2qt.conf | 3 +++ recipes-qt/qt5-addons/qtcharts_git.bb | 2 +- recipes-qt/qt5-addons/qtdatavis3d_git.bb | 2 +- recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb | 2 +- recipes-qt/qt5-addons/qtquickcompiler_git.bb | 2 +- recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb | 2 +- recipes-qt/qt5/nativesdk-qtbase_git.bbappend | 2 +- recipes-qt/qt5/qt3d_git.bbappend | 2 +- recipes-qt/qt5/qtbase-native_git.bbappend | 2 +- recipes-qt/qt5/qtbase_git.bbappend | 2 +- recipes-qt/qt5/qtcanvas3d_git.bbappend | 2 +- recipes-qt/qt5/qtconnectivity_git.bbappend | 2 +- recipes-qt/qt5/qtdeclarative_git.bbappend | 2 +- recipes-qt/qt5/qtgraphicaleffects_git.bbappend | 2 +- recipes-qt/qt5/qtimageformats_git.bbappend | 2 +- recipes-qt/qt5/qtlocation_git.bbappend | 2 +- recipes-qt/qt5/qtmultimedia_git.bbappend | 2 +- recipes-qt/qt5/qtquickcontrols2_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols_git.bbappend | 4 +++- recipes-qt/qt5/qtsensors_git.bbappend | 2 +- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qtserialport_git.bbappend | 2 +- recipes-qt/qt5/qtsvg_git.bbappend | 2 +- recipes-qt/qt5/qttools_git.bbappend | 2 +- recipes-qt/qt5/qttranslations_git.bbappend | 2 +- recipes-qt/qt5/qtwayland-native_git.bbappend | 2 +- recipes-qt/qt5/qtwayland_git.bbappend | 2 +- recipes-qt/qt5/qtwebchannel_git.bbappend | 2 +- recipes-qt/qt5/qtwebengine_git.bbappend | 4 ++-- recipes-qt/qt5/qtwebsockets_git.bbappend | 2 +- recipes-qt/qt5/qtxmlpatterns_git.bbappend | 2 +- scripts/manifest.xml | 2 +- 32 files changed, 37 insertions(+), 32 deletions(-) diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index 8b38faa..946e238 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf @@ -68,6 +68,9 @@ MACHINE_EXTRA_INSTALL_SDK_HOST ?= "" OE_QMAKE_PLATFORM_NATIVE_mingw32 = "win32-g++-oe" OE_QMAKE_PLATFORM_mingw32 = "win32-g++-oe" +# Disable SHA validation for branch +QT_MODULE_BRANCH = "5.6;nobranch=1" + PACKAGE_EXCLUDE_COMPLEMENTARY ?= "qtquickcompiler" IMAGE_FSTYPES = "tar.gz conf" diff --git a/recipes-qt/qt5-addons/qtcharts_git.bb b/recipes-qt/qt5-addons/qtcharts_git.bb index 5e95d14..559beb7 100644 --- a/recipes-qt/qt5-addons/qtcharts_git.bb +++ b/recipes-qt/qt5-addons/qtcharts_git.bb @@ -26,6 +26,6 @@ LIC_FILES_CHKSUM = "file://src/charts/qchart.h;md5=a712f087e2146153f45db2e8eb1a3 inherit qt5-module qtquickcompiler require recipes-qt/qt5/qt5-git.inc -SRCREV = "f4ba2fb9840279f986bd11ab6860e6a3125d9599" +SRCREV = "d137ae33ccf01882f80770919b1daa199dec7019" DEPENDS = "qtbase qtdeclarative qtmultimedia" diff --git a/recipes-qt/qt5-addons/qtdatavis3d_git.bb b/recipes-qt/qt5-addons/qtdatavis3d_git.bb index a148bdc..9b9f239 100644 --- a/recipes-qt/qt5-addons/qtdatavis3d_git.bb +++ b/recipes-qt/qt5-addons/qtdatavis3d_git.bb @@ -26,6 +26,6 @@ LIC_FILES_CHKSUM = "file://src/datavisualization/global/qdatavisualizationglobal inherit qt5-module require recipes-qt/qt5/qt5-git.inc -SRCREV = "4f23f0f984ef2ee96d5baa3a74a465d6734381ba" +SRCREV = "4d4a9609fab58da304e4c13b9a37531116a4fadb" DEPENDS += "qtbase qtdeclarative qtmultimedia" diff --git a/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb b/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb index 5162519..1c45cb8 100644 --- a/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb +++ b/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb @@ -26,6 +26,6 @@ LIC_FILES_CHKSUM = "file://src/plugins/scenegraph/softwarecontext/softwarelayer. inherit qt5-module require recipes-qt/qt5/qt5-git.inc -SRCREV = "3a22766e8c4ea39836f197552e92b3cc78e77f62" +SRCREV = "334ca348b0badb284a1ade66b61bdc588da64e33" DEPENDS = "qtbase qtdeclarative" diff --git a/recipes-qt/qt5-addons/qtquickcompiler_git.bb b/recipes-qt/qt5-addons/qtquickcompiler_git.bb index 42013e7..6018770 100644 --- a/recipes-qt/qt5-addons/qtquickcompiler_git.bb +++ b/recipes-qt/qt5-addons/qtquickcompiler_git.bb @@ -29,7 +29,7 @@ SRC_URI = " \ git://codereview.qt-project.org/qt/tqtc-qmlcompiler;branch=${BRANCH};protocol=ssh \ " -SRCREV = "ea222ff87942781d1091fdcd0385a0c842d21e15" +SRCREV = "a2eac30f3be41447af1c9f2c3f3c841b68ca4d9c" BRANCH = "5.6" S = "${WORKDIR}/git" diff --git a/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb b/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb index f4bdbcc..85dfcbb 100644 --- a/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb @@ -26,7 +26,7 @@ LIC_FILES_CHKSUM = "file://src/virtualkeyboard/plugin.cpp;md5=8913d0b71519756d2e inherit qt5-module qtquickcompiler require recipes-qt/qt5/qt5-git.inc -SRCREV = "4d480f8f0c1ca3308f4c3a423ad30d5d44e9c1bf" +SRCREV = "8b75b05f8b515efc6f1a6a40214cf61abc4d8a9f" DEPENDS = "qtbase qtdeclarative qtsvg hunspell" diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend index 41922ab..326bdec 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend @@ -19,7 +19,7 @@ ## ############################################################################## -SRCREV = "072f5b513e486e884ea7fa4a1cac9aedf3846374" +SRCREV = "540978288ea0f6ed0b166bb9207f427a4c825ab6" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qt3d_git.bbappend b/recipes-qt/qt5/qt3d_git.bbappend index b050083..f7ae884 100644 --- a/recipes-qt/qt5/qt3d_git.bbappend +++ b/recipes-qt/qt5/qt3d_git.bbappend @@ -25,4 +25,4 @@ SRC_URI_append_class-target = " \ file://0001-Remove-qgltf.patch \ " -SRCREV = "8fb8f65da85e16a3f4d798d2175cec918d2c5afb" +SRCREV = "2270fae50f8d69858b2df2287342c02a4cd5357c" diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/recipes-qt/qt5/qtbase-native_git.bbappend index 79e150e..31cc314 100644 --- a/recipes-qt/qt5/qtbase-native_git.bbappend +++ b/recipes-qt/qt5/qtbase-native_git.bbappend @@ -19,7 +19,7 @@ ## ############################################################################## -SRCREV = "072f5b513e486e884ea7fa4a1cac9aedf3846374" +SRCREV = "540978288ea0f6ed0b166bb9207f427a4c825ab6" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend index cc68c72..e2c4191 100644 --- a/recipes-qt/qt5/qtbase_git.bbappend +++ b/recipes-qt/qt5/qtbase_git.bbappend @@ -45,7 +45,7 @@ do_configure_prepend() { install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs } -SRCREV = "072f5b513e486e884ea7fa4a1cac9aedf3846374" +SRCREV = "540978288ea0f6ed0b166bb9207f427a4c825ab6" # Temporarily here, until merged upstream PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bbappend b/recipes-qt/qt5/qtcanvas3d_git.bbappend index c2ee6e1..7a16176 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bbappend +++ b/recipes-qt/qt5/qtcanvas3d_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "791ddce7d41b126ba4744a6701597f49dbf99f3b" +SRCREV = "72312730a7507f77898df0876b9437c43587e1d1" diff --git a/recipes-qt/qt5/qtconnectivity_git.bbappend b/recipes-qt/qt5/qtconnectivity_git.bbappend index f2040cc..0d15c67 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bbappend +++ b/recipes-qt/qt5/qtconnectivity_git.bbappend @@ -21,4 +21,4 @@ PACKAGECONFIG += "bluez4" -SRCREV = "dedff12a896d51c469d2af82664b86a10f8fa7fe" +SRCREV = "7393531856058a8a0fe440d3a64728248958ac81" diff --git a/recipes-qt/qt5/qtdeclarative_git.bbappend b/recipes-qt/qt5/qtdeclarative_git.bbappend index 4975e59..01480a6 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bbappend +++ b/recipes-qt/qt5/qtdeclarative_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "2e6f7f362e62c3285e7d395aca607502c8e8160e" +SRCREV = "18e77550f149722e0554f24ddfa326e03a9fef10" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend index 6e1888f..f7b6d74 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "6523d7c4843e1d4176035c46e1514c39bdcfc3bf" +SRCREV = "d01a936b6454834e8ead7acc5838ee5c66541a55" diff --git a/recipes-qt/qt5/qtimageformats_git.bbappend b/recipes-qt/qt5/qtimageformats_git.bbappend index 87a191b..9a83783 100644 --- a/recipes-qt/qt5/qtimageformats_git.bbappend +++ b/recipes-qt/qt5/qtimageformats_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "bf5b49878d75d316f31225f76152e8381a3d5f0f" +SRCREV = "cbf2d7e7696a4a08360c2004dfcbb8be7c1d2edb" diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend index 68d1832..8397e50 100644 --- a/recipes-qt/qt5/qtlocation_git.bbappend +++ b/recipes-qt/qt5/qtlocation_git.bbappend @@ -24,4 +24,4 @@ PACKAGECONFIG += "gypsy" EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" DEPENDS_emulator += "qtsimulator" -SRCREV = "d1f66746ab0b77b4f3300cbeeaafe61d25d78e98" +SRCREV = "2bdeea286037e5ea0d8ba0d2ad59bdf1eaae1054" diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend index e6dc5ab..818bc01 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bbappend +++ b/recipes-qt/qt5/qtmultimedia_git.bbappend @@ -23,4 +23,4 @@ PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d) ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer010', 'gstreamer010', 'gstreamer', d)}" -SRCREV = "7553a0521356d0b28bacb8c8d07a25e4ba26097e" +SRCREV = "711efc552d65f22b262e049c5a046198377519dc" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 4427501..26aa40e 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -31,7 +31,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtgraphicaleffects" -SRCREV = "ac152bfcd37f94453e9705b57ca6520ad30bade0" +SRCREV = "6ea6881ec8847dc99e05534769d6fe6198f56ead" FILES_${PN}-qmldesigner += " \ ${OE_QMAKE_PATH_QML}/*/*/*/designer \ diff --git a/recipes-qt/qt5/qtquickcontrols_git.bbappend b/recipes-qt/qt5/qtquickcontrols_git.bbappend index 3a988d8..a52513c 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bbappend +++ b/recipes-qt/qt5/qtquickcontrols_git.bbappend @@ -19,4 +19,6 @@ ## ############################################################################## -SRCREV = "26f7894dae87ef2dd6cf596decf645d1c877c950" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRCREV = "fcc9c0206433c5c940a0872447899743d1a9996a" diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend index f5301b4..dc59a6a 100644 --- a/recipes-qt/qt5/qtsensors_git.bbappend +++ b/recipes-qt/qt5/qtsensors_git.bbappend @@ -22,4 +22,4 @@ EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator" DEPENDS_emulator += "qtsimulator" -SRCREV = "0b00ee6f6c311a7f5c0b4f2441dad97a454d172e" +SRCREV = "b08c3e69e3e82014b0f16b1ff94e5edd31d5c2c6" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index fbb79ae..cfb710c 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -31,4 +31,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -SRCREV = "edf55f657a46fe16bf80d63f523848bb9b71d9f3" +SRCREV = "ec7b4b226818fa39646ec9c619b9df995952ea9c" diff --git a/recipes-qt/qt5/qtserialport_git.bbappend b/recipes-qt/qt5/qtserialport_git.bbappend index a625d74..ef91dc4 100644 --- a/recipes-qt/qt5/qtserialport_git.bbappend +++ b/recipes-qt/qt5/qtserialport_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "9a70ee2389d3302f6a4262325f8a76e4d867b478" +SRCREV = "c1355ae41ee46437e9d6583dc4ea452a82b6b53b" diff --git a/recipes-qt/qt5/qtsvg_git.bbappend b/recipes-qt/qt5/qtsvg_git.bbappend index f2d7292..c486a2d 100644 --- a/recipes-qt/qt5/qtsvg_git.bbappend +++ b/recipes-qt/qt5/qtsvg_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "e02df9c098b4d304b34c0ff65806a0576e45ed1a" +SRCREV = "0e69a7c86f1908bc282362ec59f0ccf97d35d63a" diff --git a/recipes-qt/qt5/qttools_git.bbappend b/recipes-qt/qt5/qttools_git.bbappend index 740e3fa..232f920 100644 --- a/recipes-qt/qt5/qttools_git.bbappend +++ b/recipes-qt/qt5/qttools_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "e33532e048fa12ee32429ca83ee31aa8f065147d" +SRCREV = "2d838dd06ebacc58c620614719067f6dac5e7418" diff --git a/recipes-qt/qt5/qttranslations_git.bbappend b/recipes-qt/qt5/qttranslations_git.bbappend index caba045..aeac682 100644 --- a/recipes-qt/qt5/qttranslations_git.bbappend +++ b/recipes-qt/qt5/qttranslations_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "13f1f2f12ddfc9b84535361d77a5f0f0ec8c3e0f" +SRCREV = "efa6513bbf2515fbe6ab7b365e9597a8900ae279" diff --git a/recipes-qt/qt5/qtwayland-native_git.bbappend b/recipes-qt/qt5/qtwayland-native_git.bbappend index 9fa9184..8849fd8 100644 --- a/recipes-qt/qt5/qtwayland-native_git.bbappend +++ b/recipes-qt/qt5/qtwayland-native_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "2e08d3afc08ea305052d75a306dac381d3025134" +SRCREV = "920387296abcead6fea2d801fb2f57c185657c47" diff --git a/recipes-qt/qt5/qtwayland_git.bbappend b/recipes-qt/qt5/qtwayland_git.bbappend index 9fa9184..8849fd8 100644 --- a/recipes-qt/qt5/qtwayland_git.bbappend +++ b/recipes-qt/qt5/qtwayland_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "2e08d3afc08ea305052d75a306dac381d3025134" +SRCREV = "920387296abcead6fea2d801fb2f57c185657c47" diff --git a/recipes-qt/qt5/qtwebchannel_git.bbappend b/recipes-qt/qt5/qtwebchannel_git.bbappend index 49ccceb..672745e 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bbappend +++ b/recipes-qt/qt5/qtwebchannel_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "64a106da72796377bbff5cce0ecc5a379b105498" +SRCREV = "b06c69533baeb2f80897f72ed787b51e122ffafc" diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend index 87fc55a..a7920fd 100644 --- a/recipes-qt/qt5/qtwebengine_git.bbappend +++ b/recipes-qt/qt5/qtwebengine_git.bbappend @@ -25,5 +25,5 @@ SRC_URI_append_mx6 = " \ file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \ " -SRCREV_qtwebengine = "a3318c84b022282a5a4a2babc51d1e3ca634e25b" -SRCREV_chromium = "8252b18aa3efa52138e91f9756945afb142a1c8c" +SRCREV_qtwebengine = "69351428413edb7a76ce2ca11634b1797e45e296" +SRCREV_chromium = "dc08e3972d36a63dd477de0de005b3e81a5674d9" diff --git a/recipes-qt/qt5/qtwebsockets_git.bbappend b/recipes-qt/qt5/qtwebsockets_git.bbappend index 911457c..8b8c9cd 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bbappend +++ b/recipes-qt/qt5/qtwebsockets_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "ba9306ec5a1271275d79b2f48ceb227f79352f33" +SRCREV = "0637eb3f40440f90eb531561e26f3854463bdbb3" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bbappend b/recipes-qt/qt5/qtxmlpatterns_git.bbappend index a057fb1..3150a1b 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bbappend +++ b/recipes-qt/qt5/qtxmlpatterns_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "5e6acdb2ea92add793835561e7a2d6b0ed8890f8" +SRCREV = "23b764d34705d0f858e428e02c910637368b2694" 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"/> Date: Mon, 6 Jun 2016 13:40:11 +0300 Subject: qtconnectivity: remove incorrect PACKAGECONFIG to enable bluez support The PACKAGECONFIG option for bluez support was changed from bluez4 to bluez and it's now used by default in meta-qt5. Change-Id: Ia5582fc45acedd7d9be48ce49d26624ee624427b Task-number: QTBUG-53855 Reviewed-by: Teemu Holappa --- recipes-qt/qt5/qtconnectivity_git.bbappend | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipes-qt/qt5/qtconnectivity_git.bbappend b/recipes-qt/qt5/qtconnectivity_git.bbappend index 0d15c67..018157e 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bbappend +++ b/recipes-qt/qt5/qtconnectivity_git.bbappend @@ -19,6 +19,4 @@ ## ############################################################################## -PACKAGECONFIG += "bluez4" - SRCREV = "7393531856058a8a0fe440d3a64728248958ac81" -- cgit v1.2.3-54-g00ecf From 73ad73c800e73ea7972bea63dc36c92315c0faca Mon Sep 17 00:00:00 2001 From: Samuli Piippo 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 --- scripts/manifest.xml | 2 +- scripts/manifest_fido.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 @@ - + - + Date: Wed, 8 Jun 2016 08:48:29 +0300 Subject: b2qt addons: update repository urls Repositories were opened and no longer need to use the sdk-sources Change-Id: I9131594cd8d9fc7af0bed1220b6c4b826e3c660c Reviewed-by: Kimmo Ollila Reviewed-by: Teemu Holappa --- recipes-qt/b2qt-addons/b2qt-demos.bb | 2 +- recipes-qt/b2qt-addons/b2qt-launcher.bb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb index 55b7f98..0a3fe3c 100644 --- a/recipes-qt/b2qt-addons/b2qt-demos.bb +++ b/recipes-qt/b2qt-addons/b2qt-demos.bb @@ -26,7 +26,7 @@ LIC_FILES_CHKSUM = "file://about-b2qt/AboutBoot2Qt.qml;md5=1bf19846314f7b0fa81dc inherit qmake5 sdk-sources SRC_URI = " \ - git://codereview.qt-project.org/tqtc-boot2qt/demos.git;branch=${BRANCH};protocol=ssh;name=demos;sdk-uri=5.6/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.6/Boot2Qt/sources/b2qt-demos/basicsuite/qtwebbrowser/tqtc-qtwebbrowser \ diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb index ea85c86..6fbcf45 100644 --- a/recipes-qt/b2qt-addons/b2qt-launcher.bb +++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb @@ -23,10 +23,10 @@ DESCRIPTION = "Boot to Qt Demo Launcher" LICENSE = "QtEnterprise" LIC_FILES_CHKSUM = "file://src/main.cpp;md5=1fcdf6b49fbbf2bc9c831893cca1b279;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.6/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 \ -- cgit v1.2.3-54-g00ecf From 26d76bfcb8a0e263c79e40023659c1e09148e1f0 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 8 Jun 2016 09:00:08 +0300 Subject: meta layer was renamed to meta-boot2qt Change-Id: I1b96be87215a6ddf720c83693df1f3bcc2a99b66 Reviewed-by: Teemu Holappa --- 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(-) 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