AM: Add appman tools to automotive nativesdk

Task-number: QTAUTO-274
Change-Id: I467e93dc25a314cda0a4c35fe990c2b1274bc251
Reviewed-by: Gordan Markus <gordan.markus@pelagicore.com>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>

4 files changed, 58 insertions, 3 deletions

diff --git a/recipes-qt/automotive/qtapplicationmanager_git.bb b/recipes-qt/automotive/qtapplicationmanager_git.bb
index 3b54890..c4f1eb4 100644
--- a/recipes-qt/automotive/qtapplicationmanager_git.bb
+++ b/recipes-qt/automotive/qtapplicationmanager_git.bb
@@ -29,16 +29,18 @@
 
 DESCRIPTION = "Qt component for application lifecycle management"
 LICENSE = "(GFDL-1.3 & The-Qt-Company-GPL-Exception-1.0 & (LGPL-3.0 | GPL-2.0+)) | The-Qt-Company-DCLA-2.1"
-LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=317fda864ac33d41406ff3938c3e78d1"
+LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=43a31c6abffdd61c938811959b3c1b71"
 
 inherit qt5-module
 require recipes-qt/qt5/qt5-git.inc
 
-SRCREV = "be9e9a37c2cd848cfdbb97990e0047f1a0834a8a"
+SRCREV = "74d8bb0c8590dec7d6106781b1aa460756425d8f"
 
 DEPENDS = "qtbase qtdeclarative libyaml libarchive \
            ${@base_contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}"
+
 RDEPENDS_${PN} = "libcrypto ${PN}-tools"
+RDEPENDS_${PN}_remove_mingw32 = "libcrypto"
 
 EXTRA_QMAKEVARS_PRE += "\
     ${@base_contains("DISTRO_FEATURES", "wayland", "-config force-multiprocess", "-config force-singleprocess", d)} \
@@ -55,3 +57,12 @@ do_install_append() {
 FILES_${PN} += "\
     /opt/am \
     "
+
+BBCLASSEXTEND += "nativesdk"
+
+DEPENDS_class-nativesdk = "qtbase nativesdk-glibc-locale"
+DEPENDS_class-nativesdk_remove_mingw32 += "nativesdk-glibc-locale"
+
+EXTRA_QMAKEVARS_PRE_class-nativesdk += "\
+    -config tools-only \
+    "
diff --git a/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb b/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb
index e74dd92..94bf48d 100644
--- a/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb
+++ b/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb
@@ -34,6 +34,6 @@ LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
 
 inherit populate_b2qt_qt5_sdk
 
-TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host"
+TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host"
 TOOLCHAIN_TARGET_TASK += "packagegroup-b2qt-embedded-qt5-toolchain-target \
                           packagegroup-b2qt-automotive-qt5-toolchain-target"
diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb b/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb
new file mode 100644
index 0000000..acae372
--- /dev/null
+++ b/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb
@@ -0,0 +1,39 @@
+############################################################################
+##
+## 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$
+##
+############################################################################
+
+DESCRIPTION = "Host packages for B2Qt automotive Qt5 SDK"
+LICENSE = "The-Qt-Company-DCLA-2.1"
+PR = "r0"
+
+inherit nativesdk packagegroup qtquickcompiler
+
+RDEPENDS_${PN} += "\
+    nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host \
+    nativesdk-qtapplicationmanager-tools \
+    "
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
index 78106f8..d79bf57 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
@@ -33,5 +33,10 @@ SRC_URI += "\
     file://0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch \
     "
 
+PACKAGECONFIG += "openssl"
+PACKAGECONFIG_remove_mingw32 += "openssl"
+
+PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl"
+
 fakeroot do_generate_qt_environment_file_mingw32() {
 }