From 1315d1181658b7f2065339282e6fc91476b54ed8 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Tue, 21 Feb 2017 14:47:39 +0200 Subject: gypsy: remove gypsy from meta-boot2qt layer gypsy is broken / blacklisted in poky 2.2. Remove gypsy from qtlocation component & remove gypsy .bbappend from recipes completely. Change-Id: I612d0b66af86fb5736bb9b15a44febcd6a719a51 Reviewed-by: Samuli Piippo --- recipes-qt/qt5/qtlocation_git.bbappend | 2 -- recipes/gypsy/gypsy_%.bbappend | 36 ---------------------------------- 2 files changed, 38 deletions(-) delete mode 100644 recipes/gypsy/gypsy_%.bbappend diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend index 2fed196..f199937 100644 --- a/recipes-qt/qt5/qtlocation_git.bbappend +++ b/recipes-qt/qt5/qtlocation_git.bbappend @@ -27,7 +27,5 @@ ## ############################################################################ -PACKAGECONFIG += "gypsy" - EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" DEPENDS_emulator += "qtsimulator" diff --git a/recipes/gypsy/gypsy_%.bbappend b/recipes/gypsy/gypsy_%.bbappend deleted file mode 100644 index c03c75b..0000000 --- a/recipes/gypsy/gypsy_%.bbappend +++ /dev/null @@ -1,36 +0,0 @@ -############################################################################ -## -## 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$ -## -############################################################################ - -inherit bluetooth - -DEPENDS_remove = "bluez4" -DEPENDS_append := " ${BLUEZ}" -DEPENDS += "libgudev" - -PNBLACKLIST[gypsy] = "" -- cgit v1.2.3-54-g00ecf