diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-09-02 13:16:16 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-09-02 14:12:54 +0300 |
commit | ad061d9c45001d703bc369ce370e2b38e216153f (patch) | |
tree | f18961e9aa88d92a7dca0d25570a8d8874ee6fe5 | |
parent | c3e1528ff4d725869fd4228a369ef9718721c5a0 (diff) |
meta-freescale: update layer
Update to latest revision in zeus branch & remove .bbappend available
now in upstream.
Task-number: QTBUG-84149
Change-Id: I063be5277150f8bb8a67ceb172c690a68798a8ee
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r-- | meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_%.bbappend | 30 | ||||
-rw-r--r-- | scripts/manifest.xml | 2 |
2 files changed, 1 insertions, 31 deletions
diff --git a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_%.bbappend b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_%.bbappend deleted file mode 100644 index 0a65e2f4..00000000 --- a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_%.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2020 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$ -## -############################################################################ - -LIC_FILES_CHKSUM_LAYER[vardepsexclude] += "FSL_EULA_FILE" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index f62ac4a2..4c2f23a6 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -42,7 +42,7 @@ fetch="git://github.com/Freescale"/> <project name="meta-freescale" remote="freescale" - revision="f535ddcd5cd3da846a34b1721ceda3c8b18b37a0" + revision="14f1a630a47375432f93c556927b879b51d84c4e" path="sources/meta-freescale"/> <project name="meta-freescale-3rdparty" remote="freescale" |