From c3eff2040f541e67ad2f9447459d435f7e88353b Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 10 Jan 2019 11:32:58 +0200 Subject: Add configs for mips and mips64 CI toolchains Add include files for building mips and mips64 toolchains for CI usage. gcc-sanitizers are not available on mips, so filter those out. Task-number: QTQAINFRA-2535 Change-Id: I6a90a95169985020b7eac01344c61789fe9cac49 Reviewed-by: Mikko Gronoff --- meta-boot2qt-distro/conf/distro/b2qt.conf | 2 ++ .../conf/distro/include/qemumips.conf | 32 +++++++++++++++++++ .../conf/distro/include/qemumips64.conf | 32 +++++++++++++++++++ ...kagegroup-b2qt-embedded-qt5-toolchain-target.bb | 4 +-- meta-boot2qt/classes/b2qt-utils.bbclass | 36 ++++++++++++++++++++++ 5 files changed, 104 insertions(+), 2 deletions(-) create mode 100644 meta-boot2qt-distro/conf/distro/include/qemumips.conf create mode 100644 meta-boot2qt-distro/conf/distro/include/qemumips64.conf create mode 100644 meta-boot2qt/classes/b2qt-utils.bbclass diff --git a/meta-boot2qt-distro/conf/distro/b2qt.conf b/meta-boot2qt-distro/conf/distro/b2qt.conf index 4e3e42f..ac24fac 100644 --- a/meta-boot2qt-distro/conf/distro/b2qt.conf +++ b/meta-boot2qt-distro/conf/distro/b2qt.conf @@ -40,6 +40,8 @@ BUILDCFG_VARS += "SDKMACHINE" MAINTAINER = "B2Qt " +INHERIT += "b2qt-utils" + SANITY_TESTED_DISTROS += " \ Ubuntu 11.04 \n \ Ubuntu-15.10 \n \ diff --git a/meta-boot2qt-distro/conf/distro/include/qemumips.conf b/meta-boot2qt-distro/conf/distro/include/qemumips.conf new file mode 100644 index 0000000..3e58d44 --- /dev/null +++ b/meta-boot2qt-distro/conf/distro/include/qemumips.conf @@ -0,0 +1,32 @@ +############################################################################ +## +## 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$ +## +############################################################################ + +include conf/distro/include/ci.inc + +DISTRO_FEATURES_remove = "webengine" diff --git a/meta-boot2qt-distro/conf/distro/include/qemumips64.conf b/meta-boot2qt-distro/conf/distro/include/qemumips64.conf new file mode 100644 index 0000000..3e58d44 --- /dev/null +++ b/meta-boot2qt-distro/conf/distro/include/qemumips64.conf @@ -0,0 +1,32 @@ +############################################################################ +## +## 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$ +## +############################################################################ + +include conf/distro/include/ci.inc + +DISTRO_FEATURES_remove = "webengine" diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb index 281d9b6..9fac3f6 100644 --- a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb +++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -40,7 +40,7 @@ MACHINE_EXTRA_INSTALL_SDK ?= "" RDEPENDS_${PN} += " \ ${MACHINE_EXTRA_INSTALL_SDK} \ packagegroup-core-standalone-sdk-target \ - gcc-sanitizers \ + ${@contains_regex('MACHINEOVERRIDES', '(x86_64|i.86|powerpc|sparc|s390|arm|aarch64)', 'gcc-sanitizers', '', d)} \ \ qt3d-dev \ qt3d-runtime-dev \ diff --git a/meta-boot2qt/classes/b2qt-utils.bbclass b/meta-boot2qt/classes/b2qt-utils.bbclass new file mode 100644 index 0000000..7c27348 --- /dev/null +++ b/meta-boot2qt/classes/b2qt-utils.bbclass @@ -0,0 +1,36 @@ +############################################################################ +## +## Copyright (C) 2019 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$ +## +############################################################################ + +def contains_regex(variable, regex, truevalue, falsevalue, d): + import re + val = (d.getVar(variable) or "").split(":") + for m in val: + if re.match(regex, m): + return truevalue + return falsevalue -- cgit v1.2.3-54-g00ecf