From e6dc2b8580f7657eb1fa250283ee017d94e15104 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 17 Oct 2016 15:52:27 +0300 Subject: qt5: remove obsolete file 0001-Allow-a-tools-only-build.patch Patch has been available from meta-qt5 layer for a long time. This file is identical to meta-qt5 patch, thus removed from meta-boot2qt layer. Change-Id: Ib7e82d5d22719927271aadc9604470834afb563a Reviewed-by: Samuli Piippo --- .../qt5/qt3d/0001-Allow-a-tools-only-build.patch | 31 ---------------------- 1 file changed, 31 deletions(-) delete mode 100644 recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch deleted file mode 100644 index c9d2223..0000000 --- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 778d0c4515bae5bdeb650fb3e6b3e32a73722b51 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Wed, 10 Feb 2016 09:02:09 +0200 -Subject: [PATCH] Allow a tools-only build - ---- - qt3d.pro | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/qt3d.pro b/qt3d.pro -index a26e76d..263e3c4 100644 ---- a/qt3d.pro -+++ b/qt3d.pro -@@ -1,4 +1,4 @@ --requires(contains(QT_CONFIG, opengl)) -+!tools-only:requires(contains(QT_CONFIG, opengl)) - - load(configure) - qtCompileTest(assimp) -@@ -17,3 +17,8 @@ load(qt_parts) - - OTHER_FILES += \ - sync.profile -+ -+tools-only { -+ sub_tools.depends -= sub_src -+ SUBDIRS = sub_tools -+} --- -1.9.1 - -- cgit v1.2.3-54-g00ecf From 4e40580ef45e96dcf8993bf2db5e2ee96e32a18d Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 17 Oct 2016 08:14:32 +0300 Subject: qt5: update submodules Change-Id: Iafe8b11f61554551c749ea2dedffabbff3d34a78 Reviewed-by: Samuli Piippo --- 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/qtcharts_git.bbappend | 2 +- recipes-qt/qt5/qtconnectivity_git.bbappend | 2 +- recipes-qt/qt5/qtdeclarative_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.bbappend | 2 +- recipes-qt/qt5/qtquickcontrols_git.bbappend | 2 +- recipes-qt/qt5/qtsensors_git.bbappend | 2 +- recipes-qt/qt5/qtserialbus_git.bbappend | 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/qtvirtualkeyboard_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 +- 26 files changed, 27 insertions(+), 27 deletions(-) diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend index 2ee368c..d8caa8f 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend @@ -27,7 +27,7 @@ ## ############################################################################ -SRCREV = "cf88d74466cd6506875676ef2557c179d72fe422" +SRCREV = "6feec9da93032d11a768802ac2187d9d4153b1ec" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qt3d_git.bbappend b/recipes-qt/qt5/qt3d_git.bbappend index 1d3b3ed..952c0c2 100644 --- a/recipes-qt/qt5/qt3d_git.bbappend +++ b/recipes-qt/qt5/qt3d_git.bbappend @@ -39,4 +39,4 @@ SRC_URI_append_class-target = " \ file://0001-Remove-qgltf.patch \ " -SRCREV = "88ca1827cf6532b0e8d4fbacb4bc87a515c2cff4" +SRCREV = "87efd2423e11b2103c5e50528b6f704d3fc2c84a" diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/recipes-qt/qt5/qtbase-native_git.bbappend index 033db9c..e07eb7c 100644 --- a/recipes-qt/qt5/qtbase-native_git.bbappend +++ b/recipes-qt/qt5/qtbase-native_git.bbappend @@ -27,7 +27,7 @@ ## ############################################################################ -SRCREV = "cf88d74466cd6506875676ef2557c179d72fe422" +SRCREV = "6feec9da93032d11a768802ac2187d9d4153b1ec" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend index cc30534..4939cd9 100644 --- a/recipes-qt/qt5/qtbase_git.bbappend +++ b/recipes-qt/qt5/qtbase_git.bbappend @@ -53,7 +53,7 @@ do_configure_prepend() { install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs } -SRCREV = "cf88d74466cd6506875676ef2557c179d72fe422" +SRCREV = "6feec9da93032d11a768802ac2187d9d4153b1ec" # 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 559955f..f3c0fa2 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bbappend +++ b/recipes-qt/qt5/qtcanvas3d_git.bbappend @@ -33,4 +33,4 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ " -SRCREV = "269b1d5699f6c95d46553e7ee547f1c4b7545e63" +SRCREV = "8e34d6f5399a29d45f9402219f13b631e29fd4b0" diff --git a/recipes-qt/qt5/qtcharts_git.bbappend b/recipes-qt/qt5/qtcharts_git.bbappend index 83f9b7c..fa83e28 100644 --- a/recipes-qt/qt5/qtcharts_git.bbappend +++ b/recipes-qt/qt5/qtcharts_git.bbappend @@ -29,4 +29,4 @@ inherit qtquickcompiler -SRCREV = "bf26aa9d15e525fdcf6fd3f59268418533f06790" +SRCREV = "da071825245a4ec1dc4904a9d3329db5a132c074" diff --git a/recipes-qt/qt5/qtconnectivity_git.bbappend b/recipes-qt/qt5/qtconnectivity_git.bbappend index fa3f91b..a3dc415 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bbappend +++ b/recipes-qt/qt5/qtconnectivity_git.bbappend @@ -27,5 +27,5 @@ ## ############################################################################ -SRCREV = "ecc2ca9e9e6b98e8da7c7d223cfa5eb5257591d6" +SRCREV = "7b443cd0fdd1940a8bfaad73df5e309a52b7669f" diff --git a/recipes-qt/qt5/qtdeclarative_git.bbappend b/recipes-qt/qt5/qtdeclarative_git.bbappend index cf01acd..4af6581 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bbappend +++ b/recipes-qt/qt5/qtdeclarative_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "48dce24717ca537a6f5d817b2f5cd689df86ad68" +SRCREV = "fff4477661ae240c43088fa6d9069ccf969dbee8" diff --git a/recipes-qt/qt5/qtimageformats_git.bbappend b/recipes-qt/qt5/qtimageformats_git.bbappend index 344ee7e..938a049 100644 --- a/recipes-qt/qt5/qtimageformats_git.bbappend +++ b/recipes-qt/qt5/qtimageformats_git.bbappend @@ -40,4 +40,4 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " -SRCREV = "ca1370e27a4f86771809b4499da9dc61807ba03e" +SRCREV = "11300c62aa021ef07f3e4de8bd875bfcbcbe2f7e" diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend index acb73bd..f67d2c8 100644 --- a/recipes-qt/qt5/qtlocation_git.bbappend +++ b/recipes-qt/qt5/qtlocation_git.bbappend @@ -41,4 +41,4 @@ PACKAGECONFIG += "gypsy" EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" DEPENDS_emulator += "qtsimulator" -SRCREV = "c78af3434956645b68dd13ab6b8a945239c5782c" +SRCREV = "3f813d1c8c24e5da67d3f096eb3f5c73e760e641" diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend index ae62be8..ed98dd3 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bbappend +++ b/recipes-qt/qt5/qtmultimedia_git.bbappend @@ -31,4 +31,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 = "da7d462e315fb101fc9112a294b5ca2e3bd35a75" +SRCREV = "c954fe7f171c0602cdb555ef10618769991513b6" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bbappend b/recipes-qt/qt5/qtquickcontrols2_git.bbappend index 994ca7a..cd0c9cc 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bbappend +++ b/recipes-qt/qt5/qtquickcontrols2_git.bbappend @@ -33,4 +33,4 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ " -SRCREV = "9ae57848671419b2622e254af8642fef7b1b7c33" +SRCREV = "88969bdbd66b0829fe5e5b90eeb605c663d1b887" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bbappend b/recipes-qt/qt5/qtquickcontrols_git.bbappend index c344eec..f253ea4 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bbappend +++ b/recipes-qt/qt5/qtquickcontrols_git.bbappend @@ -38,4 +38,4 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " -SRCREV = "abe319c9cb811832bb4c9c95290564dfa7b3603a" +SRCREV = "84b3cf1c0483af7ad200ab33944d8eaa4d4ffa48" diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend index 33fd900..f48150b 100644 --- a/recipes-qt/qt5/qtsensors_git.bbappend +++ b/recipes-qt/qt5/qtsensors_git.bbappend @@ -39,4 +39,4 @@ LIC_FILES_CHKSUM = " \ EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator" DEPENDS_emulator += "qtsimulator" -SRCREV = "beac0b2e3ea4b292f0473c00bcf68d75360f89ef" +SRCREV = "ecd018fe2ee4508e094f631d882ecc1360abec01" diff --git a/recipes-qt/qt5/qtserialbus_git.bbappend b/recipes-qt/qt5/qtserialbus_git.bbappend index 795422a..f06f890 100644 --- a/recipes-qt/qt5/qtserialbus_git.bbappend +++ b/recipes-qt/qt5/qtserialbus_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "398eda8be9eb3415ca44cc35dad3422311d8e221" +SRCREV = "f0482d704e3834f2199889f997b421c0171bd94f" diff --git a/recipes-qt/qt5/qtserialport_git.bbappend b/recipes-qt/qt5/qtserialport_git.bbappend index a2619f6..0150056 100644 --- a/recipes-qt/qt5/qtserialport_git.bbappend +++ b/recipes-qt/qt5/qtserialport_git.bbappend @@ -36,4 +36,4 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ " -SRCREV = "10967b1443720116744ecfc42fe442681d149c5a" +SRCREV = "dee818e77a6cf9a6c164fbc7ee132fe875f7f998" diff --git a/recipes-qt/qt5/qtsvg_git.bbappend b/recipes-qt/qt5/qtsvg_git.bbappend index 1ebc44c..975e634 100644 --- a/recipes-qt/qt5/qtsvg_git.bbappend +++ b/recipes-qt/qt5/qtsvg_git.bbappend @@ -27,7 +27,7 @@ ## ############################################################################ -SRCREV = "4469fbecd4e004979dada2da72573c06719fee3c" +SRCREV = "d3d3db5a75fe2ba992742e418bfefa25eddf7684" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ diff --git a/recipes-qt/qt5/qttools_git.bbappend b/recipes-qt/qt5/qttools_git.bbappend index f7e6db4..ebbb4c4 100644 --- a/recipes-qt/qt5/qttools_git.bbappend +++ b/recipes-qt/qt5/qttools_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "781efbabf32e4438ae9c698ce498cc32cc900c57" +SRCREV = "ae9472a39327ce5d5d6735308bd2aef272771391" diff --git a/recipes-qt/qt5/qttranslations_git.bbappend b/recipes-qt/qt5/qttranslations_git.bbappend index 4860ea8..dc7250c 100644 --- a/recipes-qt/qt5/qttranslations_git.bbappend +++ b/recipes-qt/qt5/qttranslations_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "38d6c3fe848487970640068ec12fc0c87a2938ee" +SRCREV = "c4795ce81f9165a05e6f918066c671808447c539" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend b/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend index a450ce8..5d6f4f2 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend @@ -29,7 +29,7 @@ inherit qtquickcompiler -SRCREV = "ad1da1a8c3be6ec804f3965b47d0762654f81731" +SRCREV = "5ac6b611b196c66bc8b01c23aa50d175ae7a7308" # To enabled Nuance T9 Write support, you need to provide the licensed components # and enable "t9write" in PACKAGECONFIG. This can be done in a separate .bbappend file. diff --git a/recipes-qt/qt5/qtwayland-native_git.bbappend b/recipes-qt/qt5/qtwayland-native_git.bbappend index d81cde7..1841c87 100644 --- a/recipes-qt/qt5/qtwayland-native_git.bbappend +++ b/recipes-qt/qt5/qtwayland-native_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "2f83f4490b6c644bb02fa6bf9d88e87492418723" +SRCREV = "fcaa38c84dc92ec951c43e1759d7a46080755cbc" diff --git a/recipes-qt/qt5/qtwayland_git.bbappend b/recipes-qt/qt5/qtwayland_git.bbappend index d81cde7..1841c87 100644 --- a/recipes-qt/qt5/qtwayland_git.bbappend +++ b/recipes-qt/qt5/qtwayland_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "2f83f4490b6c644bb02fa6bf9d88e87492418723" +SRCREV = "fcaa38c84dc92ec951c43e1759d7a46080755cbc" diff --git a/recipes-qt/qt5/qtwebchannel_git.bbappend b/recipes-qt/qt5/qtwebchannel_git.bbappend index f6a143b..5867432 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bbappend +++ b/recipes-qt/qt5/qtwebchannel_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "d342edcc22d3c9c0299e86805d93e7031507345b" +SRCREV = "2d29a774dd165ee2acd0b607b7e0d02a37c5fea5" diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend index 39a07f2..ba2818c 100644 --- a/recipes-qt/qt5/qtwebengine_git.bbappend +++ b/recipes-qt/qt5/qtwebengine_git.bbappend @@ -33,5 +33,5 @@ SRC_URI_append_mx6 = " \ file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \ " -SRCREV_qtwebengine = "3cc148853f0f7468526df9dd2397a70a8eeeedae" -SRCREV_chromium = "950d3ff70f627f0ee30251a84967222d5449e46d" +SRCREV_qtwebengine = "fe8ae4b78065916e1882aaedc5994d66a8456df4" +SRCREV_chromium = "881a7672e23192eaf7e1ac2f94e086b560104f10" diff --git a/recipes-qt/qt5/qtwebsockets_git.bbappend b/recipes-qt/qt5/qtwebsockets_git.bbappend index 85916fb..77bf91d 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bbappend +++ b/recipes-qt/qt5/qtwebsockets_git.bbappend @@ -34,4 +34,4 @@ LIC_FILES_CHKSUM = " \ file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \ " -SRCREV = "38d830d00fc2f8c196d736094448e55623e4b35e" +SRCREV = "60cede232aca96f3f6852c54c0d97cf1771fb371" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bbappend b/recipes-qt/qt5/qtxmlpatterns_git.bbappend index 1bb13dd..b83ba05 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bbappend +++ b/recipes-qt/qt5/qtxmlpatterns_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "332ef472a9597822cd29da143f27c8e4083af621" +SRCREV = "89dbcc4f807015736a8ce3393b857735019d098d" -- cgit v1.2.3-54-g00ecf From c73188413f5ff7746248d2845570a57b40af3e7a Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Tue, 18 Oct 2016 11:24:25 +0300 Subject: qt5 recipes cleanup Removed license checksums from .bbappend files that were overlapping with updated meta-qt5. Also cleaned a few chunks of appends available already in meta-qt5. Change-Id: Iaafb9eb1472a9909db750fec35c8ac0d231e5f63 Reviewed-by: Samuli Piippo --- recipes-qt/qt5/qt3d_git.bbappend | 6 ---- recipes-qt/qt5/qtbase_git.bbappend | 2 -- recipes-qt/qt5/qtcanvas3d_git.bbappend | 6 ---- recipes-qt/qt5/qtgraphicaleffects_git.bbappend | 13 --------- recipes-qt/qt5/qtimageformats_git.bbappend | 13 --------- recipes-qt/qt5/qtlocation_git.bbappend | 9 ------ recipes-qt/qt5/qtquickcontrols2_git.bbappend | 6 ---- recipes-qt/qt5/qtquickcontrols_git.bbappend | 11 -------- recipes-qt/qt5/qtsensors_git.bbappend | 9 ------ recipes-qt/qt5/qtserialport_git.bbappend | 9 ------ recipes-qt/qt5/qtsvg_git.bbappend | 7 ----- recipes-qt/qt5/qtvirtualkeyboard_git.bbappend | 38 -------------------------- recipes-qt/qt5/qtwebsockets_git.bbappend | 7 ----- scripts/manifest.xml | 3 +- 14 files changed, 2 insertions(+), 137 deletions(-) diff --git a/recipes-qt/qt5/qt3d_git.bbappend b/recipes-qt/qt5/qt3d_git.bbappend index 952c0c2..95ffc05 100644 --- a/recipes-qt/qt5/qt3d_git.bbappend +++ b/recipes-qt/qt5/qt3d_git.bbappend @@ -29,12 +29,6 @@ FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" -LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPLv3;md5=8211fde12cc8a4e2477602f5953f5b71 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ - file://LICENSE.GPL;md5=c96076271561b0e3785dad260634eaa8 \ -" - SRC_URI_append_class-target = " \ file://0001-Remove-qgltf.patch \ " diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend index 4939cd9..615cdc6 100644 --- a/recipes-qt/qt5/qtbase_git.bbappend +++ b/recipes-qt/qt5/qtbase_git.bbappend @@ -55,5 +55,3 @@ do_configure_prepend() { SRCREV = "6feec9da93032d11a768802ac2187d9d4153b1ec" -# 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 f3c0fa2..8c18714 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bbappend +++ b/recipes-qt/qt5/qtcanvas3d_git.bbappend @@ -27,10 +27,4 @@ ## ############################################################################ -LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ - file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ -" - SRCREV = "8e34d6f5399a29d45f9402219f13b631e29fd4b0" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend index ff9899b..8cc0676 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend @@ -27,17 +27,4 @@ ## ############################################################################ -LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ - file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ - file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ - file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ - file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ - file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ - file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ -" - SRCREV = "f536e36e3188903404fac78064ea7872dd8cc0d2" diff --git a/recipes-qt/qt5/qtimageformats_git.bbappend b/recipes-qt/qt5/qtimageformats_git.bbappend index 938a049..14d86cb 100644 --- a/recipes-qt/qt5/qtimageformats_git.bbappend +++ b/recipes-qt/qt5/qtimageformats_git.bbappend @@ -27,17 +27,4 @@ ## ############################################################################ -LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ - file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ - file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ - file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ - file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ - file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ - file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ -" - SRCREV = "11300c62aa021ef07f3e4de8bd875bfcbcbe2f7e" diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend index f67d2c8..e36ab3e 100644 --- a/recipes-qt/qt5/qtlocation_git.bbappend +++ b/recipes-qt/qt5/qtlocation_git.bbappend @@ -27,15 +27,6 @@ ## ############################################################################ -LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ - file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ - file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ - file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ -" - PACKAGECONFIG += "gypsy" EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bbappend b/recipes-qt/qt5/qtquickcontrols2_git.bbappend index cd0c9cc..aa8c29c 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bbappend +++ b/recipes-qt/qt5/qtquickcontrols2_git.bbappend @@ -27,10 +27,4 @@ ## ############################################################################ -LIC_FILES_CHKSUM = " \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ - file://LICENSE.LGPLv3;md5=a37e6cd7102174853307e03e6edc5f30 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ -" - SRCREV = "88969bdbd66b0829fe5e5b90eeb605c663d1b887" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bbappend b/recipes-qt/qt5/qtquickcontrols_git.bbappend index f253ea4..d3ece15 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bbappend +++ b/recipes-qt/qt5/qtquickcontrols_git.bbappend @@ -27,15 +27,4 @@ ## ############################################################################ -LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ - file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ - file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ - file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ - file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ -" - SRCREV = "84b3cf1c0483af7ad200ab33944d8eaa4d4ffa48" diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend index f48150b..df982d8 100644 --- a/recipes-qt/qt5/qtsensors_git.bbappend +++ b/recipes-qt/qt5/qtsensors_git.bbappend @@ -27,15 +27,6 @@ ## ############################################################################ -LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ - file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ - file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ - file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ -" - EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator" DEPENDS_emulator += "qtsimulator" diff --git a/recipes-qt/qt5/qtserialport_git.bbappend b/recipes-qt/qt5/qtserialport_git.bbappend index 0150056..131ff1c 100644 --- a/recipes-qt/qt5/qtserialport_git.bbappend +++ b/recipes-qt/qt5/qtserialport_git.bbappend @@ -27,13 +27,4 @@ ## ############################################################################ -LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ - file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ - file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \ - file://LICENSE.FDL;md5=3801d7932fdc07fd9efe89f9854a6caa \ - file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ -" - SRCREV = "dee818e77a6cf9a6c164fbc7ee132fe875f7f998" diff --git a/recipes-qt/qt5/qtsvg_git.bbappend b/recipes-qt/qt5/qtsvg_git.bbappend index 975e634..d9ebe0b 100644 --- a/recipes-qt/qt5/qtsvg_git.bbappend +++ b/recipes-qt/qt5/qtsvg_git.bbappend @@ -29,10 +29,3 @@ SRCREV = "d3d3db5a75fe2ba992742e418bfefa25eddf7684" -LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ - file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ - file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ -" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend b/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend index 5d6f4f2..379dd10 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend @@ -31,46 +31,8 @@ inherit qtquickcompiler SRCREV = "5ac6b611b196c66bc8b01c23aa50d175ae7a7308" -# To enabled Nuance T9 Write support, you need to provide the licensed components -# and enable "t9write" in PACKAGECONFIG. This can be done in a separate .bbappend file. -# for example: -#T9WRITEPACKAGE = "${HOME}/Downloads/zzEval_QT_T9Write_Alpha_v750_20150916.zip" -#SRC_URI += "file://${T9WRITEPACKAGE};subdir=git/src/virtualkeyboard/3rdparty/t9write" -#PACKAGECONFIG = "t9write lang-all" - PACKAGECONFIG ?= "lipi-toolkit lang-all hunspell" -PACKAGECONFIG[hunspell] = ",CONFIG+=disable-hunspell,hunspell" -PACKAGECONFIG[t9write] = "CONFIG+=t9write" -PACKAGECONFIG[lipi-toolkit] = "CONFIG+=lipi-toolkit" -PACKAGECONFIG[lang-all] = "CONFIG+=lang-all" -PACKAGECONFIG[lang-ar_AR] = "CONFIG+=lang-ar_AR" -PACKAGECONFIG[lang-da_DK] = "CONFIG+=lang-da_DK" -PACKAGECONFIG[lang-de_DE] = "CONFIG+=lang-de_DE" -PACKAGECONFIG[lang-en_GB] = "CONFIG+=lang-en_GB" -PACKAGECONFIG[lang-es_ES] = "CONFIG+=lang-es_ES" -PACKAGECONFIG[lang-fa_FA] = "CONFIG+=lang-fa_FA" -PACKAGECONFIG[lang-fi_FI] = "CONFIG+=lang-fi_FI" -PACKAGECONFIG[lang-fr_FR] = "CONFIG+=lang-fr_FR" -PACKAGECONFIG[lang-hi_IN] = "CONFIG+=lang-hi_IN" -PACKAGECONFIG[lang-it_IT] = "CONFIG+=lang-it_IT" -PACKAGECONFIG[lang-ja_JP] = "CONFIG+=lang-ja_JP" -PACKAGECONFIG[lang-ko_KR] = "CONFIG+=lang-ko_KR" -PACKAGECONFIG[lang-nb_NO] = "CONFIG+=lang-nb_NO" -PACKAGECONFIG[lang-pl_PL] = "CONFIG+=lang-pl_PL" -PACKAGECONFIG[lang-pt_PT] = "CONFIG+=lang-pt_PT" -PACKAGECONFIG[lang-ru_RU] = "CONFIG+=lang-ru_RU" -PACKAGECONFIG[lang-sv_SE] = "CONFIG+=lang-sv_SE" -PACKAGECONFIG[lang-zh_CN] = "CONFIG+=lang-zh_CN" -PACKAGECONFIG[lang-zh_TW] = "CONFIG+=lang-zh_TW" - -EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -EXTRA_QMAKEVARS_PRE += "${@base_contains('DISTRO_FEATURES', 'x11', '', 'CONFIG+=disable-desktop', d)}" - -PACKAGES += "${PN}-dictionaries" -RRECOMMENDS_${PN} += "${PN}-dictionaries" -FILES_${PN}-dictionaries = "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/*/*.dat" -FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" FILES_${PN}-dbg += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit/lib/.debug" INSANE_SKIP_${PN} += "libdir" INSANE_SKIP_${PN}-dbg += "libdir" diff --git a/recipes-qt/qt5/qtwebsockets_git.bbappend b/recipes-qt/qt5/qtwebsockets_git.bbappend index 77bf91d..69443dd 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bbappend +++ b/recipes-qt/qt5/qtwebsockets_git.bbappend @@ -27,11 +27,4 @@ ## ############################################################################ -LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ - file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ - file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \ -" - SRCREV = "60cede232aca96f3f6852c54c0d97cf1771fb371" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 89a97f7..ad454d1 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -11,6 +11,7 @@ + @@ -25,7 +26,7 @@ path="sources/meta-openembedded"/> Date: Thu, 20 Oct 2016 10:23:15 +0300 Subject: Improve repo fetching Add support for --device and --internal to the mirror creation. Use --optimized-fetch when initializing build env, since the internal repos in gitlab sometimes fail to be fetched, which breaks CI builds. --optimized-fetch pulls from network only if the SHA1 is not found from local repos or from mirror. Change-Id: I427aa7a652bdb63be8f6db8682a9af00c2468ab8 Reviewed-by: Mikko Gronoff Reviewed-by: Risto Avila --- b2qt-init-build-env | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/b2qt-init-build-env b/b2qt-init-build-env index c9c5f46..184af7d 100755 --- a/b2qt-init-build-env +++ b/b2qt-init-build-env @@ -151,7 +151,9 @@ mirror() { mkdir -p .repo/manifests cp ${DIR}/scripts/manifest.xml .repo/manifests/ MANIFEST="manifest.xml" - ${REPO} init ${REPO_URL} -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g all --mirror + DEVICE=${DEVICE:-all} + get_groups + ${REPO} init ${REPO_URL} -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g "${PROJECT_GROUPS}" --mirror ${REPO} sync } @@ -172,7 +174,7 @@ init() { MANIFEST="manifest.xml" fi ${REPO} init ${REPO_URL} -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g "${PROJECT_GROUPS}" ${REFERENCE} - ${REPO} sync + ${REPO} sync --optimized-fetch if [ ! -e "sources/meta-boot2qt" ]; then ln -s ${DIR} sources/meta-boot2qt -- cgit v1.2.3-54-g00ecf From b3d0c4fcb89a716b3f692e9e8ebcea651608bce1 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 26 Oct 2016 12:46:03 +0300 Subject: dbus-session-init: fix broken init script Change-Id: I3cefeb9b8c19dbd4f2e0bf9312088e6489b758c3 Reviewed-by: Risto Avila --- recipes/dbus/dbus/dbus-session.service | 4 ++-- recipes/dbus/dbus_%.bbappend | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes/dbus/dbus/dbus-session.service b/recipes/dbus/dbus/dbus-session.service index dbd6fcd..8dcf081 100644 --- a/recipes/dbus/dbus/dbus-session.service +++ b/recipes/dbus/dbus/dbus-session.service @@ -4,8 +4,8 @@ After=dbus.service [Service] Type=forking -ExecStart=/usr/bin/dbus-session.init start -ExecStop=/usr/bin/dbus-session.init stop +ExecStart=/usr/bin/dbus-session.init.sh start +ExecStop=/usr/bin/dbus-session.init.sh stop Environment=HOME=/home/root [Install] diff --git a/recipes/dbus/dbus_%.bbappend b/recipes/dbus/dbus_%.bbappend index f9f1345..dde2927 100644 --- a/recipes/dbus/dbus_%.bbappend +++ b/recipes/dbus/dbus_%.bbappend @@ -45,21 +45,21 @@ SYSTEMD_PACKAGES =+ "${PN}-session-init" FILES_${PN}-session-init = " \ ${sysconfdir}/init.d/dbus-session \ ${sysconfdir}/profile.d/dbus-session-address \ - ${bindir}/dbus-session.init \ + ${bindir}/dbus-session.init.sh \ ${systemd_unitdir}/system/dbus-session.service \ " do_install_append_class-target() { - sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-session.init >${WORKDIR}/dbus-session.init + sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-session.init >${WORKDIR}/dbus-session.init.sh if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/dbus-session.init ${D}${sysconfdir}/init.d/dbus-session + install -m 0755 ${WORKDIR}/dbus-session.init.sh ${D}${sysconfdir}/init.d/dbus-session fi if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -m 0755 -d ${D}${bindir}/ - install -m 0755 ${WORKDIR}/dbus-session.init ${D}${bindir}/ + install -m 0755 ${WORKDIR}/dbus-session.init.sh ${D}${bindir}/ install -m 0755 -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/dbus-session.service ${D}${systemd_unitdir}/system/ -- cgit v1.2.3-54-g00ecf From 1ed566023b56f0af2896ea9d544a672d637c7b23 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 26 Oct 2016 13:11:42 +0300 Subject: colibri-vf: add kernel image to rootfs The new toradex u-boot tries to find kernel image from rootfs' /boot folder instead of the separate boot partition. Change-Id: I159aa0674e6ce03dabca56f70ec454bc6a9e7336 Reviewed-by: Risto Avila --- meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend index 77ce484..dfc24a1 100644 --- a/meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend +++ b/meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend @@ -27,6 +27,8 @@ ## ############################################################################ +RDEPENDS_kernel-base = "kernel-image kernel-devicetree" + do_configure_prepend () { # FunctionFS for adb echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig -- cgit v1.2.3-54-g00ecf From 66dcebad43a54630fe81ce9c8bb73bf7603caf03 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 27 Oct 2016 08:31:34 +0300 Subject: colibri-imx7: add u-boot-nand.imx to image U-boot update script expects to find nand version of the uboot. Change-Id: I5d1c9c55bde69efba0d9767155374ce5748225ff Reviewed-by: Risto Avila --- conf/distro/include/colibri-imx7.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/distro/include/colibri-imx7.conf b/conf/distro/include/colibri-imx7.conf index 16d34e2..877177e 100644 --- a/conf/distro/include/colibri-imx7.conf +++ b/conf/distro/include/colibri-imx7.conf @@ -32,5 +32,8 @@ BOOTFS_CONTENT = "\ ${KERNEL_IMAGETYPE}-imx7s-colibri-eval-v3.dtb:imx7s-colibri-eval-v3.dtb \ " BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" +BOOT_SCRIPTS += " \ + u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \ + " DISTRO_FEATURES_remove = "webengine" -- cgit v1.2.3-54-g00ecf From fa87ab11de99cba1df75a6436e3f7e2425b67a48 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 27 Oct 2016 08:32:42 +0300 Subject: colibri-vf: use older 4.1 version of kernel to fix color issue The default 4.4 kernel has a problem with colors when using fbdev. As a workaround, use the default kernel from the previous V2.5 release. Change-Id: I4ce3b867f2eecf275cdcdad56a9f0af53541f9c5 Task-number: QTBUG-55768 Reviewed-by: Risto Avila --- conf/distro/include/colibri-vf.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf index 002e0e0..5a8498f 100644 --- a/conf/distro/include/colibri-vf.conf +++ b/conf/distro/include/colibri-vf.conf @@ -49,6 +49,7 @@ DEFAULTTUNE = "armv7ahf-neon" PREFERRED_PROVIDER_virtual/egl = "opengldummy" PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" +PREFERRED_VERSION_linux-toradex = "4.1" DISTRO_FEATURES_remove = "webengine" -- cgit v1.2.3-54-g00ecf From b224ab10aadb024fdbeb2a4416490cc08c1d6edf Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 27 Oct 2016 12:40:48 +0300 Subject: imx6: enable QT_QPA_EGLFS_FORCEVSYNC for all imx6 devices Change-Id: I35ee298c7fa74d5cc43065857bc9fa62a2f30898 Reviewed-by: Kimmo Ollila --- recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf | 1 + .../b2qt-addons/b2qt-appcontroller/nitrogen6x/appcontroller.conf | 9 --------- 2 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 recipes-qt/b2qt-addons/b2qt-appcontroller/nitrogen6x/appcontroller.conf diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf index 7105f4b..1056ea0 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf @@ -1,4 +1,5 @@ env=FB_MULTI_BUFFER=2 +env=QT_QPA_EGLFS_FORCEVSYNC=1 env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins env=QT_IM_MODULE=qtvirtualkeyboard env=QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS=/dev/input/event0 diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/nitrogen6x/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/nitrogen6x/appcontroller.conf deleted file mode 100644 index 1056ea0..0000000 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller/nitrogen6x/appcontroller.conf +++ /dev/null @@ -1,9 +0,0 @@ -env=FB_MULTI_BUFFER=2 -env=QT_QPA_EGLFS_FORCEVSYNC=1 -env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins -env=QT_IM_MODULE=qtvirtualkeyboard -env=QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS=/dev/input/event0 -env=QT_GSTREAMER_CAMERABIN_VIDEOSRC=mxc_v4l2=imxv4l2videosrc,v4l2src -env=QT_QUICK_CONTROLS_STYLE=Flat -env=XDG_RUNTIME_DIR=/tmp -base=linux -- cgit v1.2.3-54-g00ecf From 5cbab0912ab822c35d8259f4b0ae993dfbcbf5d8 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 27 Oct 2016 16:21:20 +0300 Subject: psplash: remove from image psplash does not provide systemd service, so it has not been working since we switched from sysvinit to systemd. Change-Id: I12080a3470b25c1fb07ae5ec76c6f51be7a59625 Task-number: QTBUG-56583 Reviewed-by: Risto Avila --- .../packagegroup-b2qt-embedded-base.bb | 1 - recipes/psplash/files/qt.png | Bin 9193 -> 0 bytes recipes/psplash/psplash_git.bbappend | 33 --------------------- 3 files changed, 34 deletions(-) delete mode 100644 recipes/psplash/files/qt.png delete mode 100644 recipes/psplash/psplash_git.bbappend diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb index 0e77368..55394d6 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb @@ -36,7 +36,6 @@ inherit packagegroup RDEPENDS_${PN} = "\ kernel-modules \ adbd \ - psplash \ openssh-sftp-server \ openssl \ openssl-misc \ diff --git a/recipes/psplash/files/qt.png b/recipes/psplash/files/qt.png deleted file mode 100644 index 99c5d9d..0000000 Binary files a/recipes/psplash/files/qt.png and /dev/null differ diff --git a/recipes/psplash/psplash_git.bbappend b/recipes/psplash/psplash_git.bbappend deleted file mode 100644 index 0cbff06..0000000 --- a/recipes/psplash/psplash_git.bbappend +++ /dev/null @@ -1,33 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -SPLASH_IMAGES = "file://qt.png;outsuffix=default" - -- cgit v1.2.3-54-g00ecf From 18c5cb7ecea53c07682ddfeda821e4fd32a14328 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 28 Oct 2016 10:13:38 +0300 Subject: VKB: correctly override PACKAGECONFIG VKB was built without hunspell. No libs are installed to /usr/share anymore, so the extra configs are not necessary. Change-Id: Ic58670e8b2e637f0680b5190f07bd996aa601491 Reviewed-by: Mikko Gronoff --- recipes-qt/qt5/qtvirtualkeyboard_git.bbappend | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend b/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend index 379dd10..d1a1bbc 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend @@ -31,8 +31,4 @@ inherit qtquickcompiler SRCREV = "5ac6b611b196c66bc8b01c23aa50d175ae7a7308" -PACKAGECONFIG ?= "lipi-toolkit lang-all hunspell" - -FILES_${PN}-dbg += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit/lib/.debug" -INSANE_SKIP_${PN} += "libdir" -INSANE_SKIP_${PN}-dbg += "libdir" +PACKAGECONFIG = "lipi-toolkit lang-all hunspell" -- cgit v1.2.3-54-g00ecf