diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-12-11 11:50:07 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-12-12 08:23:43 +0000 |
commit | 9038abdc1f0afe8c52fdf800f09729aaf959931b (patch) | |
tree | 0744402a5b73af9dfba04dc12faba8e97de1349d /meta-boot2qt-distro/recipes-qt | |
parent | 0096df8d41bba53687d8618dae972aae4e2145ac (diff) | |
download | meta-boot2qt-9038abdc1f0afe8c52fdf800f09729aaf959931b.tar.gz |
nativesdk-qtbase: fix packaging QA issue
nativesdk-qtbase_git.bb had a line removed in meta-qt5 commit
"3224b02 nativesdk-qtbase: use default PACKAGES" that causes following error:
ERROR: nativesdk-qtbase-5.11.2+gitAUTOINC+b0dce506cc-r0 do_package: QA Issue: nativesdk-qtbase:
Files/directories were installed but not shipped in any package:
/opt/poky/2.3.4/sysroots/x86_64-pokysdk-linux/usr/share
/opt/poky/2.3.4/sysroots/x86_64-pokysdk-linux/usr/share/cmake
/opt/poky/2.3.4/sysroots/x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake.d
/opt/poky/2.3.4/sysroots/x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake.d/OEQt5Toolchain.cmake
Moved fix from meta-qt5 to meta-boot2qt to reduce delta between meta-qt5 and upstream.
Change-Id: I452a10db11aa63e42104d159d810fee5b407dda1
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'meta-boot2qt-distro/recipes-qt')
-rw-r--r-- | meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend index 2ae2206..36b4409 100644 --- a/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend +++ b/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend | |||
@@ -1,6 +1,6 @@ | |||
1 | ############################################################################ | 1 | ############################################################################ |
2 | ## | 2 | ## |
3 | ## Copyright (C) 2016 The Qt Company Ltd. | 3 | ## Copyright (C) 2018 The Qt Company Ltd. |
4 | ## Contact: https://www.qt.io/licensing/ | 4 | ## Contact: https://www.qt.io/licensing/ |
5 | ## | 5 | ## |
6 | ## This file is part of the Boot to Qt meta layer. | 6 | ## This file is part of the Boot to Qt meta layer. |
@@ -38,6 +38,10 @@ PACKAGECONFIG_remove_mingw32 += "openssl" | |||
38 | 38 | ||
39 | PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" | 39 | PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" |
40 | 40 | ||
41 | FILES_${PN}-dev += " \ | ||
42 | ${datadir}/cmake \ | ||
43 | " | ||
44 | |||
41 | fakeroot do_generate_qt_environment_file_mingw32() { | 45 | fakeroot do_generate_qt_environment_file_mingw32() { |
42 | } | 46 | } |
43 | 47 | ||