aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* qtchooser: drop useless patch, set PVupstream/rocko-nextupstream/rockoupstream/jansa/rockoMartin Jansa2020-04-132-38/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.html https://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>
* qtbase: fix umask for do_generate_qt_environment_fileDennis Menschel2020-04-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* qt5: upgrade to Qt 5.9.9Mikko Gronoff2020-03-1336-116/+38
| | | | | | | | | | | Additionally, update recipes with relevant diff from Qt Company maintained meta-qt5 (5.9) layer. It has few commits & some upstream content merge based changes never upstreamed for one reason or another (license alterations & other minor things). Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
* qt5: update SRCREVs after v5.9.8 tags were downmerged to 5.9 branchMartin Jansa2019-05-0231-124/+31
| | | | | | | | | | | * there are only a few functional changes: qtdeclarative: 9d6d2ee21 Use Los Angeles to represent PST8PDT, not Vancouver qtimageformats: 11a7040 Update bundled libtiff to version 4.0.10 the rest are just change files Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to 5.9.8Martin Jansa2019-04-2276-91/+184
| | | | | | | | | | | | | | | * unfortunatelly most of the modules don't have the v5.9.8 tags merged to 5.9 branch yet, the only exception are: qtnetworkauth, qtremoteobjects, qttranslations * in most cases it means that we're missing just changes files, but in some cases there are also some functional commits which are missing in 5.9 SRCREV: qtdeclarative: 9d6d2ee21 Use Los Angeles to represent PST8PDT, not Vancouver qtimageformats: 11a7040 Update bundled libtiff to version 4.0.10 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: refresh patches to apply cleanly and update them on ↵Martin Jansa2019-04-1955-82/+82
| | | | | | | | github.com/meta-qt5 forks * in preparation for 5.9.8 upgrade Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtscript: update LIC_FILES_CHKSUM entriesDenys Dmytriyenko2018-11-021-4/+3
| | | | | | | | Upstream commit 51303a9ee793cdf952e165e30c50310a5ec753d6 updated license files: http://code.qt.io/cgit/qt/qtscript.git/commit/?h=5.9&id=51303a9ee793cdf952e165e30c50310a5ec753d6 Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to 5.9.7Mikko Gronoff2018-11-0136-67/+37
| | | | | | | | | | | * Update to Qt 5.9.7 * qtbase: default to internal harfbuzz-ng: With -no-harfbuzz, Qt uses internal copy of harfbuzz-old, which is no longer maintained, and is extremely buggy. Instead, use the harfbuzz-ng version if system harfbuzz is not used. Signed-off-by: mikko.gronoff <mikko.gronoff@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: don't use thumb for armv[45]Martin Jansa2018-10-151-0/+5
| | | | | | * it fails when building with gcc8 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt: upgrade to 5.9.6Martin Jansa2018-06-1674-165/+165
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: refactor ptestSamuli Piippo2018-05-157-89/+9
| | | | | | | | | | | 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>
* qtbase: use mysql_config from correct pathSamuli Piippo2018-04-201-1/+1
| | | | | | | | | 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>
* packagegroup-qt5-toolchain-target/qttranslations: fix nothing provides ↵Hongxu Jia2018-04-202-6/+0
| | | | | | | | | | | | | | | | | | | | | | 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>
* qt5: upgrade to 5.9.5Martin Jansa2018-04-1378-107/+100
| | | | | | | * use latest revision from 5.9, because 5.9.5 tag is only on 5.9.5 branch which might get removed in future I was told Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* Change default SRC_URI from github.com to code.qt.ioMikko Gronoff2018-04-122-3/+4
| | | | | | | | | | | | | 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>
* layer.conf: add LAYERSERIES_COMPATMartin Jansa2018-04-061-0/+2
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* maliit-framework-qt5: refresh patchesMartin Jansa2018-04-042-14/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.html https://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>
* qt5-git.inc: drop nobranch=1Martin Jansa2018-02-221-1/+1
| | | | | | | | | | | * sneaked in with: commit 333949a8239dfa7788b35f1059614733e11a6a25 Author: Samuli Piippo <samuli.piippo@qt.io> Date: Thu Jan 26 16:54:50 2017 +0200 Upgrade to Qt 5.8 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qwt-qt5: rewrite completelyAndreas Müller2018-01-304-67/+112
| | | | | | | | | | | | commit 1be652e5075bf3c65b521093556e9611c4a57541 master. * install pkgconfig * fix examples * DESCRIPTION -> SUMMARY * overall cleanup Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to 5.9.4Martin Jansa2018-01-2380-112/+110
| | | | | | | * update LICENSE in qtsystems which was updated to match other qt modules Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt: refresh remaining patches and tags in meta-qt5 reposMartin Jansa2018-01-1863-180/+176
| | | | | | | | | | | * 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) * use the same SRCREV and patches for nativesdk-qtbase like other qtbase recipes Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebengine: explicitly depend on bison-nativeDenys Dmytriyenko2018-01-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | 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>
* qtlocation: correct PACKAGECONFIG for mapboxglSamuli Piippo2018-01-161-2/+1
| | | | | | | | | 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> (cherry picked from commit 507e54ddacab0897fff93a1cd86e134af391f8b9)
* gstreamer1.0-plugins-bad: add expansion parameterSamuli Piippo2018-01-091-2/+2
| | | | | | | | | 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>
* Bump to Qt 5.9.3Daniel Mack2017-12-2034-37/+37
| | | | | Signed-off-by: Daniel Mack <daniel@zonque.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5-ptest.inc: fix qtxmlpatterns:do_install_ptest out-of-order callDenys Dmytriyenko2017-10-271-2/+3
| | | | | | | | | | | | | | | | | | 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>
* meta-qt5: Update to 5.9.2 releaseHerman van Hazendonk2017-10-1743-139/+76
| | | | Signed-off-by: Herman van Hazendonk <github.com@herrie.org>
* qt5: add missing commercial licenseKwangsub Kim2017-10-028-8/+8
| | | | | Signed-off-by: Kwangsub Kim <kwangsub.kim@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtxmlpatterns: Add HOMEPAGE info into recipe file.Huang Qiyu2017-09-181-0/+1
| | | | | Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qttools: Add HOMEPAGE info into recipe file.Huang Qiyu2017-09-181-0/+1
| | | | | Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtsvg: Add HOMEPAGE info into recipe file.Huang Qiyu2017-09-181-0/+1
| | | | | Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtscript: Add HOMEPAGE info into recipe file.Huang Qiyu2017-09-181-0/+1
| | | | | Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtquick1: Add HOMEPAGE info into recipe file.Huang Qiyu2017-09-181-0/+1
| | | | | Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtdeclarative: Add HOMEPAGE info into recipe file.Huang Qiyu2017-09-181-0/+1
| | | | | Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* meta: drop a useless fileMing Liu2017-09-181-178/+0
| | | | | | | | | | A useless file was added mistakenly by commit ec80b092: [ qtbase: Add OE clang specific mkspecs ] Drop it. Signed-off-by: Ming Liu <liu.ming50@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase-native: Force use of built-in pcreMike Crowe2017-09-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | If we specify neither -system-pcre nor -qt-pcre then qtbase will first see if it can find the pcre library in the system and fall back to compiling its own if that's not possible. Unfortunately, this means that if qtbase-native happens to be built on a machine with system pcre available then the resulting binaries such as bin/qt5/uic in sstate files won't work correctly on machines that don't have pcre available. Even ignoring that, it doesn't help for packages to build differently depending on how the build system is configured. We could depend on pcre-native and pass -system-pcre, but this doesn't work by default because qtbase actually requires pcre16 which is an optional (via PACKAGECONFIG) feature of pcre so the default there would need to be changed too. So, let's make qtbase-native match the default of qtbase by passing -qt-pcre in order to ensure that qtbase-native is always built with its own pcre implementation. Signed-off-by: Mike Crowe <mac@mcrowe.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase-native: set path to mkspec for cmake properly againAndreas Müller2017-09-051-0/+4
| | | | | | | | Since update to 5.9.2 native recipes in meta-qt5-extra fail due to strange path to mkspecs. This patch fixes this the hard way. Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: Fix build with musl/clangKhem Raj2017-09-055-0/+245
| | | | | Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: Add OE clang specific mkspecsKhem Raj2017-09-054-4/+87
| | | | | | | | | | | | | We can not piggy back clang anymore on existing OE mkspecs since starting 5.9 the configure is asking compiler for include paths and it needs to know if platform is clang-linux or g++-linux Fixes: ERROR: failed to parse default search paths from compiler output Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebengine: add patch for long pathsMartin Jansa2017-08-2215-26/+69
| | | | | | * imported from http://code.qt.io/cgit/yocto/meta-qt5.git/tree/recipes-qt/qt5/qtwebengine/0001-chromium-workaround-for-too-long-.rps-file-name.patch Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebengine: update 0004-Force-host-toolchain-configuration.patchMartin Jansa2017-08-222-5/+32
| | | | | | | | | | | * refresh the patch from: http://code.qt.io/cgit/yocto/meta-qt5.git/diff/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch?id=5bac910f95453d0df6fe540778dd16a9707dcabf * might fix passing arm specific flags into host builds like: gcc: error: unrecognized command line option '-mflooat-abi=hard' strip: unable to recognise the format of the input file Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebengine: fix build with glibc-2.26Martin Jansa2017-08-222-1/+27
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt: upgrade to latest revision in 5.9 branchMartin Jansa2017-08-2276-507/+134
| | | | | | * 3 patches were included upstream Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt: refresh remaining patches and add links to meta-qt5 reposMartin Jansa2017-08-2024-105/+60
| | | | | | | | | | | | | | | | | | | * remove qtdeclarative/0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch which is already applied and fuzzy patch just apply the same section twice * restore qttools/0001-add-noqtwebkit-configuration.patch which was removed from SRC_URI in 5.9 upgrade * add comment with link to meta-qt5 repository where the meta-qt5 .patch files are maintained, include branch and tag name 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: add a fix for building demobrowser without printing supportMartin Jansa2017-08-202-0/+247
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* Upgrade to Qt 5.9.0Samuli Piippo2017-08-2089-1051/+518
| | | | | | | | | | | | | | | | | | | | | | | | * adapt QtWebEngine recipe to use GN instead of GYP * add QtRemoteObjects and QtWebView as a new Qt modules * update available QtBase configure arguments * remove obsolete patches * patch all .pc files to remove build paths * include generated QML cache files in packages * the patch "configure paths for target qmake properly" could not be applied anymore and support must be done differently * QtWebEngine now requires gcc-multilib to be installed on the host system, because the host tools are built to the same bitness as the target (arm -> x86, aarch64 -> x86-64) * refresh the patches to match with b5.9* branches on: https://github.com/meta-qt5/qtbase https://github.com/meta-qt5/qtwebengine and 56-based branch on https://github.com/meta-qt5/qtwebengine-chromium Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase, qtgraphicaleffect, qtmultimedia, qtscript, qtlocation, qtwayland: ↵Martin Jansa2017-08-206-1/+44
| | | | | | disable gold to work around binutils bug Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebengine: disable SECURITY_STRINGFORMAT to fix the buildMartin Jansa2017-08-191-0/+8
| | | | | | | | * meta/conf/distro/include/security_flags.inc adds -Wformat and -Wformat-security, but openh264 adds -Wno-format after that causing build to fail Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* meta-toolchain-qt5: don't rely on COREBASE/LICENSESaul Wold2017-08-191-2/+1
| | | | | | | | This file lists the licenses in use by OE-Core and it not a proper license file, just use the COPYING.MIT. Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: fix Krogoth build regression from efa8aafMatt Hoosier2017-08-193-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With commit efa8aaf82e580a7d32eaaab48eb92d436f2e222a Author: Andreas Müller <schnitzeltony@googlemail.com> Date: Thu Feb 9 00:26:09 2017 qmake5_base.bbclass: set qt.conf by environment variable again we stopped pointing ${OE_QMAKE_QTCONF_PATH} at a valid file and instead directed it to a path which was intended not to exist. The motivation was to permit qtbase/qtbase-native/nativesdk-qtbase to build again after Qt 5.8 started paying attention to the contents of this file. The change as done in efa8aaf works well enough for Morty and subsequent releases' copies of Bitbake, but fails on earlier releases because they lack the following change: commit 2afcbfef2cd1ca568e5225884a8021df38ee3db0 Author: Ross Burton <ross.burton@intel.com> Date: 2016-07-14 13:56:22 bitbake: build: don't use $B as the default cwd for functions The result is that when we build with Krogoth or prior, the body of do_generate_qt_config_file() runs with a cwd of ${B}, which was _not_ the intent of efa8aaf. Because the working directory is ${B}, ${OE_QMAKE_QTCONF_PATH} is written in there too. do_configure() -- whose cwd is by design also ${B} -- then finds the file 'foodummy', and the build breaks for the reasons outlined in efa8aaf. This change simply shifts the implementation tactics to suppress the creation of ${OE_QMAKE_QTCONF_PATH} during qtbase rather than rely on unspecified behavior about the cwd of do_generate_qt_config_file(). (cherry picked from commit a17ff281aa8d99f770b0a049cb798235005fb93e at https://codereview.qt-project.org/yocto/meta-qt5.) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 21:05:24 +0000