From 110ddcbd069e5ba9c670597e83c3fe34f9a2b059 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 17 Mar 2017 11:43:27 +0200 Subject: RPI: use morty branch for meta-raspberrypi Remove obsolete bbappends Change-Id: I7654e83dce77332e5a437498fc7655d9563302be Reviewed-by: Mikko Gronoff --- conf/bblayers.conf.rpi.sample | 1 - meta-raspberrypi-extras/conf/layer.conf | 40 ---------------------- .../recipes/bluez5/bluez5_%.bbappend | 30 ---------------- .../gstreamer1.0-plugins-bad_1.6.3.bbappend | 30 ---------------- scripts/manifest.xml | 2 +- 5 files changed, 1 insertion(+), 102 deletions(-) delete mode 100644 meta-raspberrypi-extras/conf/layer.conf delete mode 100644 meta-raspberrypi-extras/recipes/bluez5/bluez5_%.bbappend delete mode 100644 meta-raspberrypi-extras/recipes/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bbappend diff --git a/conf/bblayers.conf.rpi.sample b/conf/bblayers.conf.rpi.sample index e376bea..86bb442 100644 --- a/conf/bblayers.conf.rpi.sample +++ b/conf/bblayers.conf.rpi.sample @@ -45,7 +45,6 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ ${BSPDIR}/sources/meta-openembedded/meta-multimedia \ ${BSPDIR}/sources/meta-boot2qt \ - ${BSPDIR}/sources/meta-boot2qt/meta-raspberrypi-extras \ ${BSPDIR}/sources/meta-mingw \ ${BSPDIR}/sources/meta-qt5 \ " diff --git a/meta-raspberrypi-extras/conf/layer.conf b/meta-raspberrypi-extras/conf/layer.conf deleted file mode 100644 index 9e64b87..0000000 --- a/meta-raspberrypi-extras/conf/layer.conf +++ /dev/null @@ -1,40 +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$ -## -############################################################################ - -# We have a conf and classes directory, append to BBPATH -BBPATH .= ":${LAYERDIR}" - -# We have a recipes directory, add to BBFILES -BBFILES += "${LAYERDIR}/recipes*/*/*.bb \ - ${LAYERDIR}/recipes*/*/*.bbappend \ - " - -BBFILE_COLLECTIONS += "b2qt_rpi" -BBFILE_PATTERN_b2qt_rpi := "^${LAYERDIR}/" -BBFILE_PRIORITY_b2qt_rpi = "20" diff --git a/meta-raspberrypi-extras/recipes/bluez5/bluez5_%.bbappend b/meta-raspberrypi-extras/recipes/bluez5/bluez5_%.bbappend deleted file mode 100644 index bb86181..0000000 --- a/meta-raspberrypi-extras/recipes/bluez5/bluez5_%.bbappend +++ /dev/null @@ -1,30 +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$ -## -############################################################################ - -SYSTEMD_SERVICE_${PN}_raspberrypi3 = "brcm43438.service bluetooth.service" diff --git a/meta-raspberrypi-extras/recipes/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bbappend b/meta-raspberrypi-extras/recipes/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bbappend deleted file mode 100644 index 13ac255..0000000 --- a/meta-raspberrypi-extras/recipes/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bbappend +++ /dev/null @@ -1,30 +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$ -## -############################################################################ - -EXTRA_OECONF_append_rpi = " LDFLAGS='-lbcm_host'" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index cd3fd42..842284f 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -43,7 +43,7 @@ groups="notdefault,external,ti"/>