From 0f191b2fb735243df629b93e2bb1d7cc7e8c63fc Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Tue, 6 Feb 2018 11:04:39 +0100 Subject: Add Automation related modules and target For OpcUA we are missing the backend libraries as they are not available upstream yet. However, building the Qt OpcUA module is a first step. Task-number: QTBUG-72001 Change-Id: I41cdce87d16b9a6dd15d381f1e0995ecac87b059 Reviewed-by: Samuli Piippo --- .../recipes-qt/images/b2qt-automation-qt5-image.bb | 55 ++++++++++++++++++++++ .../recipes-qt/meta/meta-b2qt-automation-qbsp.bb | 50 ++++++++++++++++++++ .../meta/meta-toolchain-b2qt-automation-qt5-sdk.bb | 39 +++++++++++++++ .../packagegroup-b2qt-automation-addons.bb | 41 ++++++++++++++++ ...gegroup-b2qt-automation-qt5-toolchain-target.bb | 42 +++++++++++++++++ 5 files changed, 227 insertions(+) create mode 100644 meta-boot2qt-distro/recipes-qt/images/b2qt-automation-qt5-image.bb create mode 100644 meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automation-qbsp.bb create mode 100644 meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-automation-qt5-sdk.bb create mode 100644 meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automation-addons.bb create mode 100644 meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automation-qt5-toolchain-target.bb diff --git a/meta-boot2qt-distro/recipes-qt/images/b2qt-automation-qt5-image.bb b/meta-boot2qt-distro/recipes-qt/images/b2qt-automation-qt5-image.bb new file mode 100644 index 0000000..25bfb4d --- /dev/null +++ b/meta-boot2qt-distro/recipes-qt/images/b2qt-automation-qt5-image.bb @@ -0,0 +1,55 @@ +############################################################################ +## +## Copyright (C) 2018 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 = "B2Qt Automation Qt5 image" +LICENSE = "The-Qt-Company-Commercial" +LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625" + +DEPLOY_CONF_TYPE = "Qt for Automation ($QT_VERSION)" + +IMAGE_FEATURES += "\ + package-management \ + ssh-server-dropbear \ + tools-debug \ + debug-tweaks \ + hwcodecs \ + " + +inherit core-image qbsp-image +inherit consistent_timestamps + +IMAGE_INSTALL += "\ + packagegroup-b2qt-embedded-base \ + packagegroup-b2qt-embedded-tools \ + ${@bb.utils.contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "gstreamer", "packagegroup-b2qt-embedded-gstreamer", "", d)} \ + packagegroup-b2qt-qt5-modules \ + packagegroup-b2qt-embedded-addons \ + packagegroup-b2qt-automation-addons \ + " diff --git a/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automation-qbsp.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automation-qbsp.bb new file mode 100644 index 0000000..16a1530 --- /dev/null +++ b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automation-qbsp.bb @@ -0,0 +1,50 @@ +############################################################################ +## +## Copyright (C) 2018 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 = "Meta task for QBSP creation" + +LICENSE = "The-Qt-Company-Commercial" +LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625" + +# get Qt version number +require recipes-qt/qt5/qt5-git.inc +S = "${WORKDIR}" + +inherit qbsp + +PV := "${@d.getVar('PV').split('+')[0]}" + +VERSION_SHORT = "${@d.getVar('PV').replace('.','')}" +QBSP_NAME = "Automation ${PV}" +QBSP_MACHINE = "${@d.getVar('MACHINE').replace('-','')}" +QBSP_INSTALLER_COMPONENT = "automation.${VERSION_SHORT}.yocto.${QBSP_MACHINE}" +QBSP_INSTALL_PATH = "/${PV}/Automation/${MACHINE}" + +QBSP_SDK_TASK = "meta-toolchain-b2qt-automation-qt5-sdk" +QBSP_IMAGE_TASK = "b2qt-automation-qt5-image" diff --git a/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-automation-qt5-sdk.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-automation-qt5-sdk.bb new file mode 100644 index 0000000..8cd0d04 --- /dev/null +++ b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-automation-qt5-sdk.bb @@ -0,0 +1,39 @@ +############################################################################ +## +## Copyright (C) 2018 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 = "B2Qt embedded Qt5 SDK toolchain" + +LICENSE = "The-Qt-Company-Commercial" +LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625" + +inherit populate_b2qt_qt5_sdk + +TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host" +TOOLCHAIN_TARGET_TASK += "packagegroup-b2qt-embedded-qt5-toolchain-target \ + packagegroup-b2qt-automation-qt5-toolchain-target" diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automation-addons.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automation-addons.bb new file mode 100644 index 0000000..d90e1b9 --- /dev/null +++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automation-addons.bb @@ -0,0 +1,41 @@ +############################################################################ +## +## Copyright (C) 2018 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 = "Automation specific Qt packages" +LICENSE = "The-Qt-Company-Commercial" + +inherit packagegroup + +PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" + +RDEPENDS_${PN} += " \ + qtmqtt \ + qtknx \ + qtopcua \ + " diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automation-qt5-toolchain-target.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automation-qt5-toolchain-target.bb new file mode 100644 index 0000000..257ef0f --- /dev/null +++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automation-qt5-toolchain-target.bb @@ -0,0 +1,42 @@ +############################################################################ +## +## Copyright (C) 2018 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 = "Target packages for B2Qt Automation Qt5 SDK" +LICENSE = "The-Qt-Company-Commercial" +PR = "r0" + +inherit packagegroup + +PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" + +RDEPENDS_${PN} += " \ + qtmqtt-dev \ + qtknx-dev \ + qtopcua-dev \ + " -- cgit v1.2.3-54-g00ecf