* set PV to something better than just 'git'
* drop 0001-Makefile-install-the-man-dir.patch, the change was already applied long before
the currently used SRCREV, do_patch WARNING: was correctly complaining:
WARNING: qtchooser-git-r0 do_patch:
Some of the context lines in patches were ignored. This can lead to
incorrectly applied patches.
The context lines in the patches can be updated with devtool:
devtool modify <recipe>
devtool finish --force-patch-refresh <recipe> <layer_path>
Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.htmlhttps://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
Applying patch 0001-Makefile-install-the-man-dir.patch
patching file Makefile
Hunk #1 succeeded at 2 with fuzz 1 (offset 1 line).
Hunk #2 succeeded at 79 with fuzz 2 (offset 22 lines).
Now at patch 0001-Makefile-install-the-man-dir.patch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
These features depend on underlying syscall support in kernel
and if older kernels are in use, then we can have a knob to
turn them off.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Alban Bedel <alban.bedel@avionic-design.de>
(cherry picked from commit 1ac92b6d8a)
The environment variable is empty when running qmake from SDK or
in device, which gives 'Empty filename passed to function' warning.
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
(cherry picked from commit 65db89eb7b)
When running the task "do_populate_sdk()" for an image inheriting from
"populate_sdk_qt5.bbclass", the following error could be observed in
case PACKAGE_CLASSES included "package_rpm":
ERROR: Could not invoke dnf.
[...]
Error:
Problem: package packagegroup-qt5-toolchain-target-1.0-r0.noarch
requires qtbase-mkspecs, but none of the providers can be
installed
- conflicting requests
- nothing provides /usr/bin/python needed by
qtbase-mkspecs-5.10.1+git0+6c6ace9d23-r0.armv5e
The script file in question that requires python to run is located at
"/usr/lib/qt5/mkspecs/features/uikit/devices.py".
The aforementioned dependency has been circumvented by calling python
indirectly via "/usr/bin/env".
Signed-off-by: Dennis Menschel <menschel-d@posteo.de>
Previously in commit 8124b3c768
"[...]qttranslations: fix nothing provides qttranslations-qtconfig",
the package qttranslations-qtconfig has been removed from the recipe.
But apparently, the current version of qttranslations still includes
artifacts which are not associated with any package anymore, resulting
in the following QA issue:
ERROR: QA Issue: qttranslations:
Files/directories were installed but not shipped in any package:
/usr/share/qt5/translations/qtconfig_sk.qm
/usr/share/qt5/translations/qtconfig_uk.qm
/usr/share/qt5/translations/qtconfig_ko.qm
/usr/share/qt5/translations/qtconfig_hu.qm
/usr/share/qt5/translations/qtconfig_sl.qm
/usr/share/qt5/translations/qtconfig_ja.qm
/usr/share/qt5/translations/qtconfig_zh_CN.qm
/usr/share/qt5/translations/qtconfig_ru.qm
/usr/share/qt5/translations/qtconfig_pl.qm
/usr/share/qt5/translations/qtconfig_zh_TW.qm
Please set FILES such that these items are packaged.
Alternatively if they are unneeded, avoid installing them
or delete them within do_install.
qttranslations: 10 installed and not shipped files.
[installed-vs-shipped]
These files are now removed in the do_install()-task.
The qtconfig translations were removed in
a6b3446cb023e7b3a5f8aa12ea0d650d2b804334 and
the a6b3446cb023e7b3a5f8aa12ea0d650d2b804334 commit was backported to
v5.9.5 as well, that's why this issue exists only in sumo branch with
5.10*.
$ git tag --contains a6b3446cb023e7b3a5f8aa12ea0d650d2b804334
v5.11.0
v5.11.0-beta3
v5.11.0-beta4
v5.11.0-rc1
v5.11.0-rc2
v5.11.1
v5.9.5
v5.9.6
Signed-off-by: Dennis Menschel <menschel-d@posteo.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
The branch called 5.10.1 no longer exists at code.qt.io repos.
The corresponding v5.10.1 qt tags still exist (at least on those repos
that originally got tagged during the release), and they are available
on the 5.11 branch. Thus we can keep Qt source at 5.10.1 commits, but
use 5.11 branch to check out those specific commits.
This could be a bit confusing, making it look like 5.11 is the current
default version for recipes, so for now there is a comment in qt5-git.inc
trying to clarify the situation.
A couple of repos that already were lacking 5.10.1 branch no longer
need to override QT_MODULE_BRANCH, since their chosen commits are
also available on 5.11 branch.
Signed-off-by: S. Lockwood-Childs <sjl@vctlabs.com>
mysql_config from host sysroot is found first which gives wrong paths
for cross-compilation. Use it from crosscompile path instead.
Change-Id: Ia1e7d8e0c582016130f595b1be279255e9d0b055
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Some graphics drives e.g. mali/mesa depend on this define
to use proper guards in eglplatform.h
Fixes
| In file included from /mnt/a/zonit/build/tmp/work/aarch64-bec-linux/qtmultimedia/5.10.1+gitAUTOINC+038716bb1f-r0/recipe-sysroot/usr/include/EGL/egl.h:36:0,
| from .moc/../../../../../../git/src/plugins/videonode/egl/qsgvideonode_egl.h:48,
| from .moc/moc_qsgvideonode_egl.cpp:9:
| /mnt/a/zonit/build/tmp/work/aarch64-bec-linux/qtmultimedia/5.10.1+gitAUTOINC+038716bb1f-r0/recipe-sysroot/usr/include/EGL/eglplatform.h:125:10: fatal error: X11/Xlib.h: No such file or directory
| #include <X11/Xlib.h>
| ^~~~~~~~~~~~
| compilation terminated.
| make[4]: *** [Makefile:461: .obj/moc_qsgvideonode_egl.o] Error 1
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
These licenses are in use in the fetched mapboxgl submodule but not
currently listed in the recipe: Apache-2.0, MIT, openssl and BSL-1.0.
Signed-off-by: Timo Jyrinki <timo.jyrinki@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
As the file extension *.inc is quite ambiguous, Github's linguist [1]
tends to classify such files not as Bitbake include files, but something
entirely different.
This commit overrides the default behavior of linguist to classify these
files correctly.
[1] https://github.com/github/linguist
Signed-off-by: Dennis Menschel <menschel-d@posteo.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
The custom task "do_generate_qt_environment_file" generates the
directory "environment-setup.d" with permission 775 instead of 755.
When other recipes populate the same directory with different
permissions, a package manager like RPM will report this as an error.
The solution is to either set the installation permissions explicitly
with "install -d [-m 755]", or specify the umask for the custom task.
This commit uses the latter approach and fixes errors like the following
when trying to generate an SDK:
$ bitbake <image-with-qt5> -c populate_sdk
[...]
Error: Transaction check error:
file /opt/poky/2.4.2/sysroots/x86_64-pokysdk-linux/environment-setup.d
conflicts between attempted installs of
nativesdk-cmake-3.8.2-r0.x86_64_nativesdk and
nativesdk-qtbase-tools-5.9.4+git0+0d9208cecb-r0.x86_64_nativesdk
A detailed discussion about this problem can also be found here [1].
[1] https://stackoverflow.com/a/49003464
Signed-off-by: Dennis Menschel <menschel-d@posteo.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
There have been issues in the past with github qt mirror being out of
sync with code.qt.io for certain module repos. Right now there's been a
several days long break in update cycle for seemingly all the qt
modules where content has not been pushed to the github mirror. Change
the default SRC_URI to the more reliable code.qt.io.
Change-Id: Ic7d3b9a82ef0ae502e99a8516ef78ca09250fd1e
Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* sneaked in with:
commit 333949a823
Author: Samuli Piippo <samuli.piippo@qt.io>
Date: Thu Jan 26 16:54:50 2017 +0200
Upgrade to Qt 5.8
* use 5.10.1 branch by defaut and fix QT_MODULE_BRANCH
in qtknx, qtmqtt, qtwebkit-examples, qtwebkit which don't
have 5.10.1 branch at all
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
WARNING: maliit-framework-qt5-0.99.0+gitAUTOINC+62bd54bcde-r0 do_patch:
Some of the context lines in patches were ignored. This can lead to
incorrectly applied patches.
The context lines in the patches can be updated with devtool:
devtool modify <recipe>
devtool finish --force-patch-refresh <recipe> <layer_path>
Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.htmlhttps://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
Applying patch
0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch
patching file config.pri
Hunk #1 succeeded at 144 with fuzz 1 (offset -17 lines).
Now at patch
0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Qt Purchasing was introduced as a new module in Qt 5.7. It was previously
only available with Qt's commercial license. It can be used to build payment
features.
The commit hash in the recipe is the latest in the 5.10 branch. Licenses
were combed with licensecheck tool.
Signed-off-by: Timo Jyrinki <timo.jyrinki@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* apply:
0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch
also for nativesdk-qtbase as the comment says
* drop unused:
0001-Add-missing-include-for-struct-timeval.patch
which wasn't removed in 5.10.1 upgrade
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
The '-optimize-size' option would enable the compiler to optimize
for size instead of speed. If the global compiler option already
included '-Os', this option would be enabled by default.
It would affect the whole Qt libraries and Qt applications as well.
This feature is available in Qt 5.9+.
Signed-off-by: Kwangsub Kim <kwangsub.kim@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Updated Qt modules to 5.10.1.
New recipe qtknx added.
Change-Id: I711c75253a9c0d9dcfbaac8867b35a4505d101ea
Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Current implementation was causing build issues as it cluttered source
directories and modified recipe sysroot content. Tests are now build
in the separate build directory ${B} where we don't need to worry about
moving files to the recipe sysroot, and if tests are enabled in
PACKAGECONFIG, they have been already built during do_compile task.
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Qt switched to pcre2 for 5.9. The configure switch has not been renamed.
We just need to update the build dependency.
This requires the poky commit:
0204af2 libpcre2: add packages for 16-bit and 32-bit code unit support
Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* update tag name to match the patches in meta-qt5 repository
where the meta-qt5 .patch files are maintained, so that it's
more clear from where these changes are exported (with:
git format-patch --no-numbered --no-signature)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
QtWebEngine uses bison during the build. While normally bison-native gets
staged into sysroot indirectly by the toolchain via binutils-cross, it's
better to have the dependency listed explicitly for deterministic builds.
Otherwise, when using an external toolchain, it fails like this:
| FAILED: gen/blink/core/XPathGrammar.cpp gen/blink/core/XPathGrammar.h
| .../qtwebengine/5.9.3+...-r0/recipe-sysroot-native/usr/bin/python-native/python2
| ../../../../git/src/3rdparty/chromium/third_party/WebKit/Source/build/scripts/rule_bison.py
| ../../../../git/src/3rdparty/chromium/third_party/WebKit/Source/core/xml/XPathGrammar.y gen/blink/core bison
| Traceback (most recent call last):
| File "../../../../git/src/3rdparty/chromium/third_party/WebKit/Source/build/scripts/rule_bison.py", line 83, in <module>
| returnCode = subprocess.call([bisonExe, '-d', '-p', prefix, inputFile, '-o', outputCpp])
| File ".../qtwebengine/5.9.3+...-r0/recipe-sysroot-native/usr/lib/python2.7/subprocess.py", line 168, in call
| return Popen(*popenargs, **kwargs).wait()
| File ".../qtwebengine/5.9.3+...-r0/recipe-sysroot-native/usr/lib/python2.7/subprocess.py", line 390, in __init__
| errread, errwrite)
| File ".../qtwebengine/5.9.3+...-r0/recipe-sysroot-native/usr/lib/python2.7/subprocess.py", line 1024, in _execute_child
| raise child_exception
| OSError: [Errno 2] No such file or directory
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
A flaw was introduced by commit b8a236df:
[ qt5: Fix cmake config files ]
Removing ${S}/include must be done before configure script being
called, but it's not in that case for qtbase-native recipe after
the commit, that is saying, ${S}/include was removed after configure
being called, which causes compiling issues for native build.
Further more, the logic introduced by commit b8a236df should only apply
to qtbase recipes, so they should be moved to qtbase recipes as well.
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
QT_EDITION defaults to 'opensource', but the end users could override
it with 'commercial' if they want.
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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>
The build-in qmake settings point to the sysroots on the host machine.
Running qmake on the target hence errors with:
Could not find qmake configuration file linux-oe-g++.
Error processing project file
So add qt.conf to the target image with the correct locations.
Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
While most mkspecs use hardcoded compiler names / options, qmake in
meta-qt5 is setup to get them from the environment. While this works
fine with openembedded, it does break normal workflows outside of it.
For example to get the SDK working with Qt Creator either the environmental
script most be sourced first, making it impossible to switch between
different Qt versions or the OE_QMAKE must be set for every project,
otherwise you get cryptic errors like 'make: c: Command not found',
since the compiler name is not set and hence an attempt is made to
execute only the arguments.
Likewise on the target itself, qmake doesn't work without first setting
the OE_QMAKE variables.
This patch adds default toolchains options, so it is no longer required
to set them, but keeps the flexibility to alter them from the environment.
Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This was never defined for nativesdk, which then broke sdk which
had nativesdk-qtwayland included. Rather than add it there, remove
its use everywhere, since it was not adding anything meaningful to
the build.
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
The expansion is now again optional, but for brief time
it was required. Add the default value (True) so that
the layer can be used also with older oe-core versions.
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Previous patch was removed, but PACKAGECONFIG was not changed
to match the new feature flag.
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Different HostPrefix was used when building Qt and in external
SDK's qt.conf. This caused e.g., wrong path in qmodule.pri for
PKG_CONFIG_EXECUTABLE.
Task-number: QTBUG-63097
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Using Qt based SDK for stripping ARM binaries results in errors.
Generated Makefile contains:
STRIP = \$(OE_QMAKE_STRIP)
but due to the missing export of OE_QMAKE_STRIP variable STRIP will be unset and
no strip will be perfomed:
install -m 755 -p lib/libSigUdev.so.1.0.0 /opt/poky/2.2.1/sysroots/cortexa9hf-neon-poky-linux-gnueabi/usr/lib/libSigUdev.so.1.0.0
strip-unneeded /opt/poky/2.2.1/sysroots/cortexa9hf-neon-poky-linux-gnueabi/usr/lib/libSigUdev.so.1.0.0
make: strip-unneeded: Command not found
Makefile:576: recipe for target 'install_target' failed
make: [install_target] Error 127 (ignored)
adding OE_QMAKE_STRIP=$STRIP to generated qt5.sh solve the issue.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
ptest.bbclass provides a set of standard do_*_ptest_base tasks. Each of
them calls a corresponding regular do_*_ptest task, that components are
supposed to override for own implementation. When PTEST_ENABLED is not
set, an anonymous python function removes all do_*_ptest_base tasks from
the queue. qt5-ptest.inc adds a special case for do_populate_sysroot and
re-arranges the order or ptest tasks due to that. But, unfortunately,
do_install_ptest was added directly, not do_install_ptest_base, hence when
"ptest" is disabled and all other do_*_ptest_base tasks are removed, this
one do_install_ptest task is left w/o dependencies and gets scheduled for
execution very early on, even before pseudo-native gets built and stages
"fakeroot" functionality. The fix is to add do_install_ptest_base task,
which calls do_install_ptest only when "ptest" is enabled.
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
