diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2019-10-11 13:20:57 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-10-12 15:41:24 +0300 |
| commit | 8e63489499bf975f6750c6156a764b56276e9df3 (patch) | |
| tree | b8e8aebb3a4dadaacd68f0ba6fe6e153a42692eb | |
| parent | d9a73ed50ff3127ad318705c3e069c240b3a09a7 (diff) | |
Cleanup old items
The sanity tested distros have changed their identifiers, so the
current list did match anything.
The extra functions from b2qt-utils are no longer needed for anything.
Change-Id: Ib8ec4ec8211109c349c653922481e96959cbaa98
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
| -rw-r--r-- | meta-boot2qt-distro/conf/distro/b2qt.conf | 11 | ||||
| -rw-r--r-- | meta-boot2qt/classes/b2qt-utils.bbclass | 40 |
2 files changed, 0 insertions, 51 deletions
diff --git a/meta-boot2qt-distro/conf/distro/b2qt.conf b/meta-boot2qt-distro/conf/distro/b2qt.conf index 65bede65..829fdc1c 100644 --- a/meta-boot2qt-distro/conf/distro/b2qt.conf +++ b/meta-boot2qt-distro/conf/distro/b2qt.conf @@ -40,17 +40,6 @@ BUILDCFG_VARS += "SDKMACHINE" MAINTAINER = "B2Qt <b2qt@qt.io>" -INHERIT += "b2qt-utils" - -SANITY_TESTED_DISTROS += " \ - Ubuntu 11.04 \n \ - Ubuntu-15.10 \n \ - LinuxMint-14 \n \ - LinuxMint-16 \n \ - LinuxMint-17.1 \n \ - LinuxMint-18.1 \n \ - " - SYSVINIT_ENABLED_GETTYS = "" DISTRO_FEATURES_DEFAULT_remove = "irda pcmcia pci 3g nfc zeroconf x11" diff --git a/meta-boot2qt/classes/b2qt-utils.bbclass b/meta-boot2qt/classes/b2qt-utils.bbclass deleted file mode 100644 index dc5aca6e..00000000 --- a/meta-boot2qt/classes/b2qt-utils.bbclass +++ /dev/null @@ -1,40 +0,0 @@ -############################################################################ -## -## 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 - -# bring back base_conditional as Draak is using too old meta layer -def base_conditional(variable, checkvalue, truevalue, falsevalue, d): - return oe.utils.conditional(variable, checkvalue, truevalue, falsevalue, d) |