Rename nvidia extra layers

Reserve meta-tegra-extras for the open source meta-tegra layer
used for Jetson TX1 and TK1.

Change-Id: I78b168105f306ee342671b612205d68b56016c14
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>

19 files changed, 4 insertions, 45 deletions

diff --git a/conf/bblayers.conf.nvidia-tegra.sample b/conf/bblayers.conf.nvidia-tegra.sample
index ec480ef..c1ac918 100644
--- a/conf/bblayers.conf.nvidia-tegra.sample
+++ b/conf/bblayers.conf.nvidia-tegra.sample
@@ -46,8 +46,7 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
   ${BSPDIR}/sources/meta-boot2qt \
-  ${BSPDIR}/sources/meta-boot2qt/meta-vib4-extras \
-  ${BSPDIR}/sources/meta-boot2qt/meta-tegra-extras \
+  ${BSPDIR}/sources/meta-boot2qt/meta-nvidia-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
diff --git a/meta-tegra-extras/conf/layer.conf b/meta-nvidia-extras/conf/layer.conf
index c170570..f1717ac 100644
--- a/meta-tegra-extras/conf/layer.conf
+++ b/meta-nvidia-extras/conf/layer.conf
@@ -35,6 +35,6 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
             ${LAYERDIR}/recipes*/*/*.bbappend \
 "
 
-BBFILE_COLLECTIONS += "b2qt_tegra"
-BBFILE_PATTERN_b2qt_tegra := "^${LAYERDIR}/"
-BBFILE_PRIORITY_b2qt_tegra = "20"
+BBFILE_COLLECTIONS += "b2qt_nvidia"
+BBFILE_PATTERN_b2qt_nvidia := "^${LAYERDIR}/"
+BBFILE_PRIORITY_b2qt_nvidia = "20"
diff --git a/meta-tegra-extras/recipes/connman-conf/connman-conf.bbappend b/meta-nvidia-extras/recipes/connman-conf/connman-conf.bbappend
index 3cfe234..3cfe234 100644
--- a/meta-tegra-extras/recipes/connman-conf/connman-conf.bbappend
+++ b/meta-nvidia-extras/recipes/connman-conf/connman-conf.bbappend
diff --git a/meta-tegra-extras/recipes/connman-conf/connman-conf/main.conf b/meta-nvidia-extras/recipes/connman-conf/connman-conf/main.conf
index a1e45b9..a1e45b9 100644
--- a/meta-tegra-extras/recipes/connman-conf/connman-conf/main.conf
+++ b/meta-nvidia-extras/recipes/connman-conf/connman-conf/main.conf
diff --git a/meta-tegra-extras/recipes/egl-gles-nv/egl-gles-nv_1.0.bbappend b/meta-nvidia-extras/recipes/egl-gles-nv/egl-gles-nv_1.0.bbappend
index 4314a20..4314a20 100644
--- a/meta-tegra-extras/recipes/egl-gles-nv/egl-gles-nv_1.0.bbappend
+++ b/meta-nvidia-extras/recipes/egl-gles-nv/egl-gles-nv_1.0.bbappend
diff --git a/meta-tegra-extras/recipes/firmware/tegra-firmware_1.0.bbappend b/meta-nvidia-extras/recipes/firmware/tegra-firmware_1.0.bbappend
index d3e2337..d3e2337 100644
--- a/meta-tegra-extras/recipes/firmware/tegra-firmware_1.0.bbappend
+++ b/meta-nvidia-extras/recipes/firmware/tegra-firmware_1.0.bbappend
diff --git a/meta-tegra-extras/recipes/graphics-headers/graphics-headers_1.0.bbappend b/meta-nvidia-extras/recipes/graphics-headers/graphics-headers_1.0.bbappend
index df91dfe..df91dfe 100644
--- a/meta-tegra-extras/recipes/graphics-headers/graphics-headers_1.0.bbappend
+++ b/meta-nvidia-extras/recipes/graphics-headers/graphics-headers_1.0.bbappend
diff --git a/meta-vib4-extras/recipes/linux-libc-headers/linux-libc-headers_4.%.bbappend b/meta-nvidia-extras/recipes/linux-libc-headers/linux-libc-headers_4.%.bbappend
index f2bdba1..f2bdba1 100644
--- a/meta-vib4-extras/recipes/linux-libc-headers/linux-libc-headers_4.%.bbappend
+++ b/meta-nvidia-extras/recipes/linux-libc-headers/linux-libc-headers_4.%.bbappend
diff --git a/meta-vib4-extras/recipes/linux/linux-nvidia.bbappend b/meta-nvidia-extras/recipes/linux/linux-nvidia.bbappend
index 70ee515..70ee515 100644
--- a/meta-vib4-extras/recipes/linux/linux-nvidia.bbappend
+++ b/meta-nvidia-extras/recipes/linux/linux-nvidia.bbappend
diff --git a/meta-tegra-extras/recipes/qt5/qtbase_git.bbappend b/meta-nvidia-extras/recipes/qt5/qtbase_git.bbappend
index 8770c65..8770c65 100644
--- a/meta-tegra-extras/recipes/qt5/qtbase_git.bbappend
+++ b/meta-nvidia-extras/recipes/qt5/qtbase_git.bbappend
diff --git a/meta-tegra-extras/recipes/qt5/qtwebengine_git.bbappend b/meta-nvidia-extras/recipes/qt5/qtwebengine_git.bbappend
index 94178db..94178db 100644
--- a/meta-tegra-extras/recipes/qt5/qtwebengine_git.bbappend
+++ b/meta-nvidia-extras/recipes/qt5/qtwebengine_git.bbappend
diff --git a/meta-vib4-extras/recipes/systemd/systemd_%.bbappend b/meta-nvidia-extras/recipes/systemd/systemd_%.bbappend
index 53ea1e4..53ea1e4 100644
--- a/meta-vib4-extras/recipes/systemd/systemd_%.bbappend
+++ b/meta-nvidia-extras/recipes/systemd/systemd_%.bbappend
diff --git a/meta-tegra-extras/recipes/tegra-drivers/tegra-drivers/egl.pc b/meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers/egl.pc
index da1f5f7..da1f5f7 100644
--- a/meta-tegra-extras/recipes/tegra-drivers/tegra-drivers/egl.pc
+++ b/meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers/egl.pc
diff --git a/meta-tegra-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend b/meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend
index 2cc22df..2cc22df 100644
--- a/meta-tegra-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend
+++ b/meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend
diff --git a/meta-vib4-extras/recipes/wayland/wayland/always-build-scanner.patch b/meta-nvidia-extras/recipes/wayland/wayland/always-build-scanner.patch
index 5e0e6bf..5e0e6bf 100644
--- a/meta-vib4-extras/recipes/wayland/wayland/always-build-scanner.patch
+++ b/meta-nvidia-extras/recipes/wayland/wayland/always-build-scanner.patch
diff --git a/meta-vib4-extras/recipes/wayland/wayland_%.bbappend b/meta-nvidia-extras/recipes/wayland/wayland_%.bbappend
index 463d5a1..463d5a1 100644
--- a/meta-vib4-extras/recipes/wayland/wayland_%.bbappend
+++ b/meta-nvidia-extras/recipes/wayland/wayland_%.bbappend
diff --git a/meta-vib4-extras/recipes/weston/weston/disable-wayland-scanner-pkg-check.patch b/meta-nvidia-extras/recipes/weston/weston/disable-wayland-scanner-pkg-check.patch
index 062da5c..062da5c 100644
--- a/meta-vib4-extras/recipes/weston/weston/disable-wayland-scanner-pkg-check.patch
+++ b/meta-nvidia-extras/recipes/weston/weston/disable-wayland-scanner-pkg-check.patch
diff --git a/meta-vib4-extras/recipes/weston/weston_%.bbappend b/meta-nvidia-extras/recipes/weston/weston_%.bbappend
index cfc286f..cfc286f 100644
--- a/meta-vib4-extras/recipes/weston/weston_%.bbappend
+++ b/meta-nvidia-extras/recipes/weston/weston_%.bbappend
diff --git a/meta-vib4-extras/conf/layer.conf b/meta-vib4-extras/conf/layer.conf
deleted file mode 100644
index 525c018..0000000
--- a/meta-vib4-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_vib4"
-BBFILE_PATTERN_b2qt_vib4 := "^${LAYERDIR}/"
-BBFILE_PRIORITY_b2qt_vib4 = "20"