From ae2d6d14123d0eae08b04e9e31bdd129aff119e6 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 1 Sep 2016 09:43:22 +0300 Subject: toradex: stop using meta-toradex All needed toradex recipes are now in meta-fsl-arm-extra Change-Id: I3eedacd83845087d2369cf4d4b6df2a030d6d283 Reviewed-by: Teemu Holappa --- conf/bblayers.conf.sample | 2 -- conf/bblayers.conf.toradex.sample | 54 --------------------------------- conf/distro/include/apalis-imx6.conf | 1 - conf/distro/include/colibri-imx6.conf | 1 - conf/distro/include/colibri-imx7.conf | 2 -- conf/distro/include/colibri-vf.conf | 8 ----- conf/distro/include/toradex.inc | 56 ----------------------------------- 7 files changed, 124 deletions(-) delete mode 100644 conf/bblayers.conf.toradex.sample delete mode 100644 conf/distro/include/toradex.inc (limited to 'conf') diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample index 6bd83c8..95b4e3f 100644 --- a/conf/bblayers.conf.sample +++ b/conf/bblayers.conf.sample @@ -43,14 +43,12 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-beagleboard/common-bsp \ ${BSPDIR}/sources/meta-ti \ ${BSPDIR}/sources/meta-raspberrypi \ - ${BSPDIR}/sources/meta-toradex \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ ${BSPDIR}/sources/meta-openembedded/meta-multimedia \ ${BSPDIR}/sources/meta-boot2qt \ ${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \ ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \ ${BSPDIR}/sources/meta-boot2qt/meta-beagleboard-extras \ - ${BSPDIR}/sources/meta-boot2qt/meta-toradex-extras \ ${BSPDIR}/sources/meta-mingw \ ${BSPDIR}/sources/meta-qt5 \ " diff --git a/conf/bblayers.conf.toradex.sample b/conf/bblayers.conf.toradex.sample deleted file mode 100644 index 9472025..0000000 --- a/conf/bblayers.conf.toradex.sample +++ /dev/null @@ -1,54 +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$ -## -############################################################################ - -# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf -# changes incompatibly -POKY_BBLAYERS_CONF_VERSION = "2" - -BBPATH = "${TOPDIR}" -BBFILES ?= "" -BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" - -BBLAYERS ?= " \ - ${BSPDIR}/sources/poky/meta \ - ${BSPDIR}/sources/poky/meta-poky \ - ${BSPDIR}/sources/meta-toradex \ - ${BSPDIR}/sources/meta-fsl-arm \ - ${BSPDIR}/sources/meta-fsl-arm-extra \ - ${BSPDIR}/sources/meta-openembedded/meta-oe \ - ${BSPDIR}/sources/meta-openembedded/meta-python \ - ${BSPDIR}/sources/meta-openembedded/meta-networking \ - ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ - ${BSPDIR}/sources/meta-openembedded/meta-multimedia \ - ${BSPDIR}/sources/meta-boot2qt \ - ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \ - ${BSPDIR}/sources/meta-boot2qt/meta-toradex-extras \ - ${BSPDIR}/sources/meta-mingw \ - ${BSPDIR}/sources/meta-qt5 \ - " diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf index fdc211d..58bcdba 100644 --- a/conf/distro/include/apalis-imx6.conf +++ b/conf/distro/include/apalis-imx6.conf @@ -27,7 +27,6 @@ ## ############################################################################ -include conf/distro/include/toradex.inc include conf/distro/include/imx6.inc include conf/distro/include/imx6-egl.inc diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf index 6427ee9..eabaf91 100644 --- a/conf/distro/include/colibri-imx6.conf +++ b/conf/distro/include/colibri-imx6.conf @@ -27,7 +27,6 @@ ## ############################################################################ -include conf/distro/include/toradex.inc include conf/distro/include/imx6.inc include conf/distro/include/imx6-egl.inc diff --git a/conf/distro/include/colibri-imx7.conf b/conf/distro/include/colibri-imx7.conf index 722da17..193e6aa 100644 --- a/conf/distro/include/colibri-imx7.conf +++ b/conf/distro/include/colibri-imx7.conf @@ -20,8 +20,6 @@ ## ############################################################################# -include conf/distro/include/toradex.inc - DEPLOY_CONF_NAME = "Toradex Colibri iMX7" IMAGE_FSTYPES += "ext3 sdcard" diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf index db970fd..e4fdd93 100644 --- a/conf/distro/include/colibri-vf.conf +++ b/conf/distro/include/colibri-vf.conf @@ -27,14 +27,6 @@ ## ############################################################################ -include conf/distro/include/toradex.inc - -BBMASK += "\ - meta-fsl-arm-extra/recipes-kernel/kernel-module-mcc-toradex \ - meta-fsl-arm-extra/recipes-kernel/kernel-modules/kernel-module-mcc_2.1.01.bb \ - meta-fsl-arm-extra/recipes-bsp/mqxboot \ - " - DEPLOY_CONF_NAME = "Toradex Colibri VF" IMAGE_FSTYPES += "ext3 sdcard" diff --git a/conf/distro/include/toradex.inc b/conf/distro/include/toradex.inc deleted file mode 100644 index 54df01a..0000000 --- a/conf/distro/include/toradex.inc +++ /dev/null @@ -1,56 +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$ -## -############################################################################ - -BBMASK += "\ - meta-toradex/recipes-mozilla \ - meta-toradex/recipes-browser \ - meta-toradex/recipes-lxde \ - meta-toradex/recipes-connectivity \ - meta-toradex/recipes-gnome \ - meta-toradex/recipes/trdx-config \ - meta-toradex/recipes-multimedia/webm \ - meta-toradex/recipes-qt \ - meta-toradex/recipes-core/psplash \ - meta-toradex/recipes-support/florence \ - meta-toradex/recipes-core/systemd \ - meta-toradex/recipes-efl \ - meta-toradex/recipes-core/dropbear \ - meta-toradex/recipes-support/icu \ - meta-toradex/recipes-support/i2c-tools \ - meta-toradex/recipes-benchmark \ - meta-toradex/recipes-core/udev \ - meta-toradex/recipes-support/gnutls \ - meta-toradex/recipes-graphics/gpu-viv-bin-mx6q \ - meta-toradex/recipes-multimedia/gstreamer \ - meta-toradex/recipes-fsl/packagegroups \ - meta-toradex/recipes-core/glibc \ - meta-toradex/recipes-sato/webkit \ - meta-toradex/recipes-bsp/binary-drivers/cudatoolkit6.5 \ - meta-toradex/recipes-bsp/binary-drivers/opencv4tegra \ - " -- cgit v1.2.3-54-g00ecf