From 8acc59f5dcae64b2e2dad807d1cf518295fa7888 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 11 Aug 2017 16:01:31 +0300 Subject: TI: update to pyro Change-Id: I1d6e265f0823fe55095a782811fe51662f81e1a2 Reviewed-by: Mikko Gronoff --- meta-ti-extras/recipes/dtc/dtc_%.bbappend | 39 ++++++++++++++++++++ meta-ti-extras/recipes/dtc/dtc_git.bbappend | 39 -------------------- .../recipes/linux/linux-ti-staging_%.bbappend | 41 ++++++++++++++++++++++ .../recipes/linux/linux-ti-staging_4.4.bbappend | 41 ---------------------- scripts/manifest.xml | 2 +- 5 files changed, 81 insertions(+), 81 deletions(-) create mode 100644 meta-ti-extras/recipes/dtc/dtc_%.bbappend delete mode 100644 meta-ti-extras/recipes/dtc/dtc_git.bbappend create mode 100644 meta-ti-extras/recipes/linux/linux-ti-staging_%.bbappend delete mode 100644 meta-ti-extras/recipes/linux/linux-ti-staging_4.4.bbappend diff --git a/meta-ti-extras/recipes/dtc/dtc_%.bbappend b/meta-ti-extras/recipes/dtc/dtc_%.bbappend new file mode 100644 index 0000000..c22b103 --- /dev/null +++ b/meta-ti-extras/recipes/dtc/dtc_%.bbappend @@ -0,0 +1,39 @@ +############################################################################ +## +## Copyright (C) 2017 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$ +## +############################################################################ + +FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" + +SRCREV = "d71d25d76012896521f937bf0c69f27b1a37cdc2" + +SRC_URI += " \ + file://0001-fdtdump-Add-live-tree-dump-capability.patch \ + file://0002-DTBO-magic-and-dtbo-format-options.patch \ + file://0003-dtc-Plugin-and-fixup-support.patch \ + file://0004-plugin-Transparently-support-old-style-syntax.patch \ + " diff --git a/meta-ti-extras/recipes/dtc/dtc_git.bbappend b/meta-ti-extras/recipes/dtc/dtc_git.bbappend deleted file mode 100644 index e4f43eb..0000000 --- a/meta-ti-extras/recipes/dtc/dtc_git.bbappend +++ /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$ -## -############################################################################ - -FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" - -SRCREV = "d71d25d76012896521f937bf0c69f27b1a37cdc2" - -SRC_URI += " \ - file://0001-fdtdump-Add-live-tree-dump-capability.patch \ - file://0002-DTBO-magic-and-dtbo-format-options.patch \ - file://0003-dtc-Plugin-and-fixup-support.patch \ - file://0004-plugin-Transparently-support-old-style-syntax.patch \ - " diff --git a/meta-ti-extras/recipes/linux/linux-ti-staging_%.bbappend b/meta-ti-extras/recipes/linux/linux-ti-staging_%.bbappend new file mode 100644 index 0000000..a3c7cac --- /dev/null +++ b/meta-ti-extras/recipes/linux/linux-ti-staging_%.bbappend @@ -0,0 +1,41 @@ +############################################################################ +## +## Copyright (C) 2017 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$ +## +############################################################################ + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SRC_URI += "\ + file://usb-serial.cfg \ + " +KERNEL_CONFIG_FRAGMENTS += "${WORKDIR}/usb-serial.cfg" + +KERNEL_GIT_URI_beaglebone = "git://github.com/beagleboard/linux;nobranch=1" +BRANCH_beaglebone = "4.4" +SRCREV_beaglebone = "dbe8c873f443cb8ac52e95790d0c958b81d7eddf" +PV_beaglebone = "4.4.19+git${SRCPV}" +DEPENDS_append_beaglebone = " lzop-native" +RRECOMMENDS_kernel-base_append_beaglebone = " bb-org-overlays" diff --git a/meta-ti-extras/recipes/linux/linux-ti-staging_4.4.bbappend b/meta-ti-extras/recipes/linux/linux-ti-staging_4.4.bbappend deleted file mode 100644 index 0d9e282..0000000 --- a/meta-ti-extras/recipes/linux/linux-ti-staging_4.4.bbappend +++ /dev/null @@ -1,41 +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$ -## -############################################################################ - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += "\ - file://usb-serial.cfg \ - " -KERNEL_CONFIG_FRAGMENTS += "${WORKDIR}/usb-serial.cfg" - -KERNEL_GIT_URI_beaglebone = "git://github.com/beagleboard/linux;nobranch=1" -BRANCH_beaglebone = "4.4" -SRCREV_beaglebone = "dbe8c873f443cb8ac52e95790d0c958b81d7eddf" -PV_beaglebone = "4.4.19+git${SRCPV}" -DEPENDS_append_beaglebone = " lzop-native" -RRECOMMENDS_kernel-base_append_beaglebone = " bb-org-overlays" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 95209bf..5c5e558 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -43,7 +43,7 @@ groups="notdefault,external,fsl,toradex,smx6"/>