RPI: use morty branch for meta-raspberrypi

Remove obsolete bbappends Change-Id: I7654e83dce77332e5a437498fc7655d9563302be Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
author: Samuli Piippo <samuli.piippo@qt.io> 2017-03-17 11:43:27 +0200
committer: Samuli Piippo <samuli.piippo@qt.io> 2017-03-17 15:03:59 +0000
commit: 110ddcbd069e5ba9c670597e83c3fe34f9a2b059 (patch)
tree: fd7ac0ffb7b318676f2493419a0e3d5a43c3fe86
parent: cb5ae2774e8f1ce73b84b5e7fc4ddcb89a3b2bf9 (diff)
download: meta-boot2qt-110ddcbd069e5ba9c670597e83c3fe34f9a2b059.tar.gz
5 files changed, 1 insertions, 102 deletions
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"/>
  <project name="meta-raspberrypi"
           remote="yocto"
-           revision="2745399f75d7564fcc586d0365ff73be47849d0e"
+           revision="cce6292e41493158c26f5b1b7fded97faacf10d7"
           path="sources/meta-raspberrypi"
           groups="notdefault,external,rpi"/>
  <project name="meta-freescale-3rdparty"
author	Samuli Piippo <samuli.piippo@qt.io>	2017-03-17 11:43:27 +0200
committer	Samuli Piippo <samuli.piippo@qt.io>	2017-03-17 15:03:59 +0000
commit	110ddcbd069e5ba9c670597e83c3fe34f9a2b059 (patch)
tree	fd7ac0ffb7b318676f2493419a0e3d5a43c3fe86
parent	cb5ae2774e8f1ce73b84b5e7fc4ddcb89a3b2bf9 (diff)
download	meta-boot2qt-110ddcbd069e5ba9c670597e83c3fe34f9a2b059.tar.gz

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 ?= " \
45	${BSPDIR}/sources/meta-openembedded/meta-initramfs \	45	${BSPDIR}/sources/meta-openembedded/meta-initramfs \
46	${BSPDIR}/sources/meta-openembedded/meta-multimedia \	46	${BSPDIR}/sources/meta-openembedded/meta-multimedia \
47	${BSPDIR}/sources/meta-boot2qt \	47	${BSPDIR}/sources/meta-boot2qt \
48	${BSPDIR}/sources/meta-boot2qt/meta-raspberrypi-extras \
49	${BSPDIR}/sources/meta-mingw \	48	${BSPDIR}/sources/meta-mingw \
50	${BSPDIR}/sources/meta-qt5 \	49	${BSPDIR}/sources/meta-qt5 \
51	"	50	"


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 @@
1	############################################################################
2	##
3	## Copyright (C) 2016 The Qt Company Ltd.
4	## Contact: https://www.qt.io/licensing/
5	##
6	## This file is part of the Boot to Qt meta layer.
7	##
8	## $QT_BEGIN_LICENSE:GPL$
9	## Commercial License Usage
10	## Licensees holding valid commercial Qt licenses may use this file in
11	## accordance with the commercial license agreement provided with the
12	## Software or, alternatively, in accordance with the terms contained in
13	## a written agreement between you and The Qt Company. For licensing terms
14	## and conditions see https://www.qt.io/terms-conditions. For further
15	## information use the contact form at https://www.qt.io/contact-us.
16	##
17	## GNU General Public License Usage
18	## Alternatively, this file may be used under the terms of the GNU
19	## General Public License version 3 or (at your option) any later version
20	## approved by the KDE Free Qt Foundation. The licenses are as published by
21	## the Free Software Foundation and appearing in the file LICENSE.GPL3
22	## included in the packaging of this file. Please review the following
23	## information to ensure the GNU General Public License requirements will
24	## be met: https://www.gnu.org/licenses/gpl-3.0.html.
25	##
26	## $QT_END_LICENSE$
27	##
28	############################################################################
29
30	# We have a conf and classes directory, append to BBPATH
31	BBPATH .= ":${LAYERDIR}"
32
33	# We have a recipes directory, add to BBFILES
34	BBFILES += "${LAYERDIR}/recipes//*.bb \
35	${LAYERDIR}/recipes//*.bbappend \
36	"
37
38	BBFILE_COLLECTIONS += "b2qt_rpi"
39	BBFILE_PATTERN_b2qt_rpi := "^${LAYERDIR}/"
40	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 @@
1	############################################################################
2	##
3	## Copyright (C) 2016 The Qt Company Ltd.
4	## Contact: https://www.qt.io/licensing/
5	##
6	## This file is part of the Boot to Qt meta layer.
7	##
8	## $QT_BEGIN_LICENSE:GPL$
9	## Commercial License Usage
10	## Licensees holding valid commercial Qt licenses may use this file in
11	## accordance with the commercial license agreement provided with the
12	## Software or, alternatively, in accordance with the terms contained in
13	## a written agreement between you and The Qt Company. For licensing terms
14	## and conditions see https://www.qt.io/terms-conditions. For further
15	## information use the contact form at https://www.qt.io/contact-us.
16	##
17	## GNU General Public License Usage
18	## Alternatively, this file may be used under the terms of the GNU
19	## General Public License version 3 or (at your option) any later version
20	## approved by the KDE Free Qt Foundation. The licenses are as published by
21	## the Free Software Foundation and appearing in the file LICENSE.GPL3
22	## included in the packaging of this file. Please review the following
23	## information to ensure the GNU General Public License requirements will
24	## be met: https://www.gnu.org/licenses/gpl-3.0.html.
25	##
26	## $QT_END_LICENSE$
27	##
28	############################################################################
29
30	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 @@
1	############################################################################
2	##
3	## Copyright (C) 2016 The Qt Company Ltd.
4	## Contact: https://www.qt.io/licensing/
5	##
6	## This file is part of the Boot to Qt meta layer.
7	##
8	## $QT_BEGIN_LICENSE:GPL$
9	## Commercial License Usage
10	## Licensees holding valid commercial Qt licenses may use this file in
11	## accordance with the commercial license agreement provided with the
12	## Software or, alternatively, in accordance with the terms contained in
13	## a written agreement between you and The Qt Company. For licensing terms
14	## and conditions see https://www.qt.io/terms-conditions. For further
15	## information use the contact form at https://www.qt.io/contact-us.
16	##
17	## GNU General Public License Usage
18	## Alternatively, this file may be used under the terms of the GNU
19	## General Public License version 3 or (at your option) any later version
20	## approved by the KDE Free Qt Foundation. The licenses are as published by
21	## the Free Software Foundation and appearing in the file LICENSE.GPL3
22	## included in the packaging of this file. Please review the following
23	## information to ensure the GNU General Public License requirements will
24	## be met: https://www.gnu.org/licenses/gpl-3.0.html.
25	##
26	## $QT_END_LICENSE$
27	##
28	############################################################################
29
30	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 @@
43	groups="notdefault,external,ti"/>	43	groups="notdefault,external,ti"/>
44	<project name="meta-raspberrypi"	44	<project name="meta-raspberrypi"
45	remote="yocto"	45	remote="yocto"
46	revision="2745399f75d7564fcc586d0365ff73be47849d0e"	46	revision="cce6292e41493158c26f5b1b7fded97faacf10d7"
47	path="sources/meta-raspberrypi"	47	path="sources/meta-raspberrypi"
48	groups="notdefault,external,rpi"/>	48	groups="notdefault,external,rpi"/>
49	<project name="meta-freescale-3rdparty"	49	<project name="meta-freescale-3rdparty"