From 0103760ff29668af74f40d3d344de48dbe920c63 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 14 Dec 2018 10:50:21 +0200 Subject: Remove opencv includes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There's no need to include opencv in these two particular machines. If ever required, consider including them in packageconfigs for all targets. Change-Id: I77bf162855412a9e8c84885c00a2dcb7a0dce63e Reviewed-by: Pasi Petäjäjärvi --- .../conf/distro/include/imx6qdlsabresd.conf | 1 - .../conf/distro/include/nitrogen6x.conf | 1 - meta-boot2qt-distro/conf/distro/include/opencv.inc | 39 ---------------------- 3 files changed, 41 deletions(-) delete mode 100644 meta-boot2qt-distro/conf/distro/include/opencv.inc diff --git a/meta-boot2qt-distro/conf/distro/include/imx6qdlsabresd.conf b/meta-boot2qt-distro/conf/distro/include/imx6qdlsabresd.conf index 5f3ddb3..644dac0 100644 --- a/meta-boot2qt-distro/conf/distro/include/imx6qdlsabresd.conf +++ b/meta-boot2qt-distro/conf/distro/include/imx6qdlsabresd.conf @@ -28,7 +28,6 @@ ############################################################################ include conf/distro/include/fsl.inc -include conf/distro/include/opencv.inc DEPLOY_CONF_NAME = "NXP i.MX6QP/Q/DL SABRE Smart Device" diff --git a/meta-boot2qt-distro/conf/distro/include/nitrogen6x.conf b/meta-boot2qt-distro/conf/distro/include/nitrogen6x.conf index f6871be..7883ab5 100644 --- a/meta-boot2qt-distro/conf/distro/include/nitrogen6x.conf +++ b/meta-boot2qt-distro/conf/distro/include/nitrogen6x.conf @@ -28,7 +28,6 @@ ############################################################################ include conf/distro/include/boundary.inc -include conf/distro/include/opencv.inc DEPLOY_CONF_NAME = "Boundary Devices i.MX6" diff --git a/meta-boot2qt-distro/conf/distro/include/opencv.inc b/meta-boot2qt-distro/conf/distro/include/opencv.inc deleted file mode 100644 index a1d37df..0000000 --- a/meta-boot2qt-distro/conf/distro/include/opencv.inc +++ /dev/null @@ -1,39 +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$ -## -############################################################################ - -MACHINE_EXTRA_INSTALL += "\ - libopencv-core \ - libopencv-imgproc \ - libopencv-objdetect \ - " - -MACHINE_EXTRA_INSTALL_SDK += " \ - opencv-dev \ - " - -- cgit v1.2.3-54-g00ecf