diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2017-01-31 08:24:30 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-02-15 08:32:05 +0000 |
commit | 505d8414e11d4da9d8fc485931f2af6fdfd5912f (patch) | |
tree | 743f22f93422748f243c125908c1eaf90af6e8f6 | |
parent | cbfd8dd6a9ff034ec1e2839c1e72ee0973163195 (diff) | |
download | meta-boot2qt-505d8414e11d4da9d8fc485931f2af6fdfd5912f.tar.gz |
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>
-rw-r--r-- | conf/bblayers.conf.nvidia-tegra.sample | 3 | ||||
-rw-r--r-- | meta-nvidia-extras/conf/layer.conf (renamed from meta-tegra-extras/conf/layer.conf) | 6 | ||||
-rw-r--r-- | meta-nvidia-extras/recipes/connman-conf/connman-conf.bbappend (renamed from meta-tegra-extras/recipes/connman-conf/connman-conf.bbappend) | 0 | ||||
-rw-r--r-- | meta-nvidia-extras/recipes/connman-conf/connman-conf/main.conf (renamed from meta-tegra-extras/recipes/connman-conf/connman-conf/main.conf) | 0 | ||||
-rw-r--r-- | meta-nvidia-extras/recipes/egl-gles-nv/egl-gles-nv_1.0.bbappend (renamed from meta-tegra-extras/recipes/egl-gles-nv/egl-gles-nv_1.0.bbappend) | 0 | ||||
-rw-r--r-- | meta-nvidia-extras/recipes/firmware/tegra-firmware_1.0.bbappend (renamed from meta-tegra-extras/recipes/firmware/tegra-firmware_1.0.bbappend) | 0 | ||||
-rw-r--r-- | meta-nvidia-extras/recipes/graphics-headers/graphics-headers_1.0.bbappend (renamed from meta-tegra-extras/recipes/graphics-headers/graphics-headers_1.0.bbappend) | 0 | ||||
-rw-r--r-- | meta-nvidia-extras/recipes/linux-libc-headers/linux-libc-headers_4.%.bbappend (renamed from meta-vib4-extras/recipes/linux-libc-headers/linux-libc-headers_4.%.bbappend) | 0 | ||||
-rw-r--r-- | meta-nvidia-extras/recipes/linux/linux-nvidia.bbappend (renamed from meta-vib4-extras/recipes/linux/linux-nvidia.bbappend) | 0 | ||||
-rw-r--r-- | meta-nvidia-extras/recipes/qt5/qtbase_git.bbappend (renamed from meta-tegra-extras/recipes/qt5/qtbase_git.bbappend) | 0 | ||||
-rw-r--r-- | meta-nvidia-extras/recipes/qt5/qtwebengine_git.bbappend (renamed from meta-tegra-extras/recipes/qt5/qtwebengine_git.bbappend) | 0 | ||||
-rw-r--r-- | meta-nvidia-extras/recipes/systemd/systemd_%.bbappend (renamed from meta-vib4-extras/recipes/systemd/systemd_%.bbappend) | 0 | ||||
-rw-r--r-- | meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers/egl.pc (renamed from meta-tegra-extras/recipes/tegra-drivers/tegra-drivers/egl.pc) | 0 | ||||
-rw-r--r-- | meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend (renamed from meta-tegra-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend) | 0 | ||||
-rw-r--r-- | meta-nvidia-extras/recipes/wayland/wayland/always-build-scanner.patch (renamed from meta-vib4-extras/recipes/wayland/wayland/always-build-scanner.patch) | 0 | ||||
-rw-r--r-- | meta-nvidia-extras/recipes/wayland/wayland_%.bbappend (renamed from meta-vib4-extras/recipes/wayland/wayland_%.bbappend) | 0 | ||||
-rw-r--r-- | meta-nvidia-extras/recipes/weston/weston/disable-wayland-scanner-pkg-check.patch (renamed from meta-vib4-extras/recipes/weston/weston/disable-wayland-scanner-pkg-check.patch) | 0 | ||||
-rw-r--r-- | meta-nvidia-extras/recipes/weston/weston_%.bbappend (renamed from meta-vib4-extras/recipes/weston/weston_%.bbappend) | 0 | ||||
-rw-r--r-- | meta-vib4-extras/conf/layer.conf | 40 |
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 ?= " \ | |||
46 | ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ | 46 | ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ |
47 | ${BSPDIR}/sources/meta-openembedded/meta-multimedia \ | 47 | ${BSPDIR}/sources/meta-openembedded/meta-multimedia \ |
48 | ${BSPDIR}/sources/meta-boot2qt \ | 48 | ${BSPDIR}/sources/meta-boot2qt \ |
49 | ${BSPDIR}/sources/meta-boot2qt/meta-vib4-extras \ | 49 | ${BSPDIR}/sources/meta-boot2qt/meta-nvidia-extras \ |
50 | ${BSPDIR}/sources/meta-boot2qt/meta-tegra-extras \ | ||
51 | ${BSPDIR}/sources/meta-mingw \ | 50 | ${BSPDIR}/sources/meta-mingw \ |
52 | ${BSPDIR}/sources/meta-qt5 \ | 51 | ${BSPDIR}/sources/meta-qt5 \ |
53 | " | 52 | " |
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 \ | |||
35 | ${LAYERDIR}/recipes*/*/*.bbappend \ | 35 | ${LAYERDIR}/recipes*/*/*.bbappend \ |
36 | " | 36 | " |
37 | 37 | ||
38 | BBFILE_COLLECTIONS += "b2qt_tegra" | 38 | BBFILE_COLLECTIONS += "b2qt_nvidia" |
39 | BBFILE_PATTERN_b2qt_tegra := "^${LAYERDIR}/" | 39 | BBFILE_PATTERN_b2qt_nvidia := "^${LAYERDIR}/" |
40 | BBFILE_PRIORITY_b2qt_tegra = "20" | 40 | 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 @@ | |||
1 | ############################################################################ | ||
2 | ## | ||
3 | ## Copyright (C) 2016 The Qt Company Ltd. | ||
4 | ## Contact: https://www.qt.io/licensing/ | ||
5 | ## | ||
6 | ## This file is part of the Boot to Qt meta layer. | ||
7 | ## | ||
8 | ## $QT_BEGIN_LICENSE:GPL$ | ||
9 | ## Commercial License Usage | ||
10 | ## Licensees holding valid commercial Qt licenses may use this file in | ||
11 | ## accordance with the commercial license agreement provided with the | ||
12 | ## Software or, alternatively, in accordance with the terms contained in | ||
13 | ## a written agreement between you and The Qt Company. For licensing terms | ||
14 | ## and conditions see https://www.qt.io/terms-conditions. For further | ||
15 | ## information use the contact form at https://www.qt.io/contact-us. | ||
16 | ## | ||
17 | ## GNU General Public License Usage | ||
18 | ## Alternatively, this file may be used under the terms of the GNU | ||
19 | ## General Public License version 3 or (at your option) any later version | ||
20 | ## approved by the KDE Free Qt Foundation. The licenses are as published by | ||
21 | ## the Free Software Foundation and appearing in the file LICENSE.GPL3 | ||
22 | ## included in the packaging of this file. Please review the following | ||
23 | ## information to ensure the GNU General Public License requirements will | ||
24 | ## be met: https://www.gnu.org/licenses/gpl-3.0.html. | ||
25 | ## | ||
26 | ## $QT_END_LICENSE$ | ||
27 | ## | ||
28 | ############################################################################ | ||
29 | |||
30 | # We have a conf and classes directory, append to BBPATH | ||
31 | BBPATH .= ":${LAYERDIR}" | ||
32 | |||
33 | # We have a recipes directory, add to BBFILES | ||
34 | BBFILES += "${LAYERDIR}/recipes*/*/*.bb \ | ||
35 | ${LAYERDIR}/recipes*/*/*.bbappend \ | ||
36 | " | ||
37 | |||
38 | BBFILE_COLLECTIONS += "b2qt_vib4" | ||
39 | BBFILE_PATTERN_b2qt_vib4 := "^${LAYERDIR}/" | ||
40 | BBFILE_PRIORITY_b2qt_vib4 = "20" | ||