Commit Graph

37 Commits

Author SHA1 Message Date
Martin Jansa
f13a3cec17 packagegroup-qt5-toolchain-target: Use TUNE_PKGARCH instead of MACHINE_ARCH
* it was changed to MACHINE_ARCH in:
  commit 0d88f4488f (marc-cpdesign/master-next, marc-cpdesign/jansa/master)
  Author: Khem Raj <raj.khem@gmail.com>
  Date:   Thu Dec 5 11:31:27 2019 -0800

    packagegroup-qt5-toolchain-target: Make machine specific

    We want to deploy arch specific overrides

    Signed-off-by: Khem Raj <raj.khem@gmail.com>

* but TUNE_PKGARCH qt5-creator has packagegroup-qt5-toolchain-target in
  RRECOMMENDS_${PN} causing:

   === Comparing signatures for task do_package_write_ipk.sigdata between tissot and mido ===
  ERROR: qt5-creator different signature for task do_package_write_ipk.sigdata between tissot and mido
  NOTE: Starting bitbake server...
  Hash for dependent task packagegroups/packagegroup-qt5-toolchain-target.bb:do_packagedata changed from f8a21ed2c484abfbadae768ec9a2e04883e80fe7ac32f7eaf442f12b4cd1b65b to bd700f438812693132a93e88c2518c81818d89856d8793b8eae479dc7a180b68
  Unable to find matching sigdata for /home/jenkins/workspace/luneos-testing/webos-ports/meta-qt5/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb:do_packagedata with hashes f8a21ed2c484abfbadae768ec9a2e04883e80fe7ac32f7eaf442f12b4cd1b65b or bd700f438812693132a93e88c2518c81818d89856d8793b8eae479dc7a180b68

  ERROR: 1 errors found in /home/jenkins/workspace/luneos-testing/webos-ports/tmp-glibc/sstate-diff/1579172712/signatures.mido.do_package_write_ipk.sigdata.log

* use TUNE_PKGARCH to match qt5-creator while still allowing arch
  specific overrides

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2020-01-24 12:27:15 +01:00
Martin Jansa
a35403dcf6 qtwebkit: remove
* it wasn't updated for very long time and I assume that all users already migrated to qtwebengine
  if not let me know that you'll start maintaining this recipe

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2020-01-24 11:57:45 +01:00
Marc Reilly
47399df989 nativesdk-packagegroup: fix cmake builds using sdk
The cmake toolchain init files are packaged into nativesdk-qtbase-dev.

Signed-off-by: Marc Reilly <marc@cpdesign.com.au>
2020-01-13 13:58:53 +01:00
Samuli Piippo
aa50163cbe qtenginio: remove obsolete module
QtEnginio hasn't been supported in a long while.

Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
2020-01-11 14:59:12 +01:00
Khem Raj
0d88f4488f packagegroup-qt5-toolchain-target: Make machine specific
We want to deploy arch specific overrides

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-12-09 12:11:33 +01:00
Khem Raj
2a2055fab9 recipes: Disable clang dependent recipes for riscv64/32
Since clang is not buildable for RISC-V, as yet, these should be
disabled as well.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-12-09 12:11:33 +01:00
Andreas Müller
6629131e77 packagegroup-qt5-toolchain-target: add qtbase-tools
From Qt perspective qmake/moc and friends are part of the toolchain

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-02-24 09:51:40 +00:00
Martin Jansa
1b755b2e05 qttranslations, packagegroup-qt5-toolchain-target: drop qmlviewer
* it was removed from qttranslations in upstream commit:
  commit c49e22e0b3a48b67f481f7362b74d90e6596b60f
  Author: Kai Koehne <kai.koehne@qt.io>
  Date:   Mon Dec 3 14:44:42 2018 +0100

    Drop qtquick1 module

    qtquick1 has been removed from Qt in 5.6. The qtquick1 got removed
    from the supermodule in qt 5.11.2 (see change
    d60ef0b20247 in qt5.git). So it's high time to also remove the
    qtquick1 and qmlviewer translation logic from qttranslations.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2018-12-23 19:40:35 +00:00
Scott Ellis
fe453ec4a2 packagegroup-qt5-toolchain-target: Skip qtwebkit if opengl not found
Resolves #129

Signed-off-by: Scott Ellis <scott@jumpnowtek.com>
2018-11-26 09:49:22 -02:00
Martin Jansa
3224b028e7 nativesdk-qtbase: use default PACKAGES
* don't append -tools to all packages
* fixes automatic packaging of .debug files in ${PN}-dbg

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2018-09-20 13:16:22 +00:00
Seokha Ko
c2e4ec603b nativesdk-packagegroup-qt5-toolchain-host: Add perl modules
perl modules are needed for syncqt.pl
2018-08-14 13:49:02 +02:00
Khem Raj
3a4ad5408a packagegroup-qt5-toolchain-target: Remove non-existing qttranslations-qt from rdeps
Fixes
ERROR: Nothing RPROVIDES 'qttranslations-qt' (but /home/jenkins/oe/world/oe-build/sources/meta-qt5/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb RDEPENDS on or otherwise requires it)
NOTE: Runtime target 'qttranslations-qt' is unbuildable, removing...

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-07-27 15:09:55 +02:00
Andreas Müller
7193a7f1f4 qtquick1: remove recipe and all references
* webkit part is broken (at least)
* It is dead since 5.7 / 11/2016

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2018-06-05 13:51:04 +00:00
Martin Jansa
5bbfbca705 packagegroup-qt5-toolchain-target: drop both qtwebkit packages
* qtwebkit builds needs to be fixed first

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2018-04-20 10:06:37 +00:00
Hongxu Jia
8124b3c768 packagegroup-qt5-toolchain-target/qttranslations: fix nothing provides qttranslations-qtconfig
It failed to build meta-toolchain-qt5:
...
Error:
 Problem: conflicting requests
  - nothing provides qttranslations-qtconfig needed by packagegroup-qt5-toolchain-target-1.0-r0.noarch
...

The upstream removed qtconfig translations:
...
commit a6b3446cb023e7b3a5f8aa12ea0d650d2b804334
Author: Alexander Volkov <a.volkov@rusbitech.ru>
Date:   Thu Sep 14 19:33:25 2017 +0300

    Remove qtconfig translations
...

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
2018-04-18 11:30:47 +00:00
texierp
1ad923abbf packagegroup-qt5-toolchain-target: Add qtcharts and qtmqtt
Signed-off-by: Pierre-Jean TEXIER <texier.pj2@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2018-02-22 13:56:45 +00:00
Max Krummenacher
0fd9104da4 packagegroup-qt5-qtcreator-debug: remove qtdeclarative-plugins
This package is no longer created, it was also removed when moving to qt 5.8
with commit 333949a823 from
packagegroup-qt5-toolchain-target.bb.

As the packagegroup was added for a target providing cross-debugging services
for qtcreator (commit 53242713da) and maybe the
package parent qtdeclarative is still needed, add that one instead.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-12-27 19:22:17 +00:00
Niels Kolthoff
b72a117386 packagegroup-qt5-toolchain-target: add qtquickcontrols2 package
Signed-off-by: Niels Kolthoff <nkolthoff@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-03-16 17:47:24 +01:00
Yann PERON
4f44a5799a packagegroup-qt5-toolchain-target: Add QtSerialBus to meta-toolchain-qt5.
Dynamic library Qt5SerialBus.so was not created in toolchain file system when I built bitbake meta-toolchain-qt5

Signed-off-by: Yann PERON <yann.peron@optimatic.fr>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-03-07 13:33:53 +01:00
Samuli Piippo
333949a823 Upgrade to Qt 5.8
The linux-oe-g++ mkspec is changed to use $$(...) operator to obtain
the contents of an environment value when qmake is run instead of when
Makefile is processed. All OE_QMAKE_xxx variables need to be exported
for qmake to find them. configure's setBootstrapVariable function needs
to change $$(..) to normal $(...) operator to work with qmake's Makefile.

qt.conf generation for qtbase recipes is not needed, as configure will
generate its own version based on configure arguments. Skip running
qmake, since configure is now automatically invoked when it's run in
qtbase's root folder.

Update PACKAGECONFIGs for qtbase to match current configure options.

The new Qt configuration system [1] can be used with a new variable
EXTRA_QMAKEVARS_CONFIGURE, which takes both command line and feature
arguments.

Merge the two qtwayland recipes to one that supports all three targets
(target, native, nativesdk) without need for additional patch.

Recipes for new Qt modules: QtSCXML, QtNetworkAuth, QtGamepad.
Removes qtdeclarative-render2d

[1] https://www.mail-archive.com/development@qt-project.org/msg25257.html

Change-Id: Ib37c4d7323e8b45aa2b171e8427b6ec15aaee213
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-01-26 16:18:39 +01:00
Ann Thornton
c16c4662db packagegroup-qt5-toolchain-target.bb: Add qtdeclarative-tools to RDEPENDS.
Signed-off-by: Ann Thornton <ann.thornton@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2016-06-09 11:00:32 -03:00
Martin Jansa
8034aa9807 qtbase: remove fonts packages
* fonts were removed from qtbase in:
  commit c5ceabb9a1caf6b9b7615a28c3097f221772f645
  Author: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
  Date:   Mon Aug 17 18:32:41 2015 +0200

    Purge all fonts

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-02 15:17:13 +02:00
Andreas Müller
802b395222 replace base_contains by bb.utils.contains
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-02 15:16:07 +02:00
Samuli Piippo
7ac1481d0a qt5: add Qml support to lupdate
Add dependency to qtdeclarative to qttools' native and nativesdk builds.
This gives us lupdate with a support for Qml files. The nativesdk builds
of qtdeclarative depend on more modules (Xml, Sql) from nativesdk-qtbase,
so preserve all libs that are already built. This brings few extra libs
to the package that might not be needed, but keeps the recipe simpler.

Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-14 18:54:55 +01:00
Jonathan Liu
82b8dc3a17 packagegroup-qt5-toolchain-target: do not check for meta-ruby layer
The ruby recipe has been moved into OE-core so checking for the
meta-ruby layer is no longer needed as the ruby recipe will always
be present.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-12-18 13:12:04 +01:00
Ivan Sergio Borgonovo
8ec05fe446 packagegroup-qt5-toolchain-target: move qttools-plugins to RRECOMENDS
* since it's built just with examples
* qttools-plugins contains just example plugins for qtcreator and get
  built just with examples. A working qt5 toolchain doesn't really
  require it

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-10-27 12:03:01 +01:00
Ivan Sergio Borgonovo
cbec759fff packagegroup-qt5-toolchain-target: respect opengl DISTRO_FEATURE
conditionally add to RDEPENDS all qt3d and -qmlplugins that
depends on opengl

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-10-27 12:03:01 +01:00
Jonathan Liu
dd6ba2b525 packagegroup-qt5-toolchain-target: add qttranslations-qtwebsockets
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-09-07 17:05:42 +02:00
Stephan Binner
aa11ed05ca Add qttranslations to qt5-versions.inc and packagegroups
Signed-off-by: Stephan Binner <stephan.binner@basyskom.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-02-27 17:50:32 +01:00
Stephan Binner
7b615428cf qtwebchannel: Add recipes for 5.4.0 and Git
Signed-off-by: Stephan Binner <stephan.binner@basyskom.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2015-02-13 10:16:12 -02:00
Jonathan Liu
c4de929f38 packagegroup-qt5-toolchain-target: always include qttools packages
The qttools packages were included only if the ruby layer was enabled
as it required qtwebkit. However, qttools now has a PACKAGECONFIG
option for qtwebkit and does not enable it by default so we can include
the qttools packages even if the ruby layer is not enabled.

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-10-21 09:37:45 -02:00
Jonathan Liu
a0da57e5ce packagegroup-qt5-toolchain-target: Add qtenginio, qtwebsockets
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-06-10 12:11:51 +02:00
Otavio Salvador
7dd1fcdecb packagegroup-qt5-toolchain-target: Don't require qtquickcontrols-qmlplugins
The qtquickcontrols-qmlplugins requirement has been move to a runtime
recommendation so we don't fail in case it is not available.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-05-28 10:24:41 -03:00
Jonathan Liu
4b000961f3 packagegroup-qt5-toolchain-target: include all modules for development
This adds the necessary target packages for development with all of the
Qt 5 modules.

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-03-29 17:16:51 -03:00
Otavio Salvador
53242713da packagegroup-qt5-qtcreator-debug: Add package group
This allow for easy installation of needed packages for remote
debugging using QtCreator. The qtdeclarative-plugins package provides
the needed infrastructure to remotely debug QML application.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Tested-by: Giulian Vivan <giulian@ossystems.com.br>
2014-02-28 10:47:04 -03:00
Otavio Salvador
3cc5613d22 packagegroup-qt5-toolchain-target: Add packagegroup
Allow easy inclusion of target packages for the Qt5 SDK or external
toolchain.

The list of the target package is based on the Arago Project, which
has been contribute by Denys Dmytriyenko <denys@ti.com>.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-02-11 15:34:46 -02:00
Otavio Salvador
d768d97528 nativesdk-packagegroup-qt5-toolchain-host: Add packagegroup
Allow easy inclusion of host packages for the Qt5 standalone SDK or
external toolchain.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-02-07 11:39:50 -02:00