diff options
30 files changed, 140 insertions, 828 deletions
diff --git a/b2qt-init-build-env b/b2qt-init-build-env index 08abc2a..f35e40a 100755 --- a/b2qt-init-build-env +++ b/b2qt-init-build-env | |||
@@ -127,9 +127,6 @@ get_groups() { | |||
127 | intel-corei7-64) | 127 | intel-corei7-64) |
128 | PROJECT_GROUPS="intel" | 128 | PROJECT_GROUPS="intel" |
129 | ;; | 129 | ;; |
130 | nvidia-logan) | ||
131 | PROJECT_GROUPS="nvidia-logan" | ||
132 | ;; | ||
133 | tegra-x1|tegra-t18x) | 130 | tegra-x1|tegra-t18x) |
134 | PROJECT_GROUPS="nvidia-tegra" | 131 | PROJECT_GROUPS="nvidia-tegra" |
135 | ;; | 132 | ;; |
diff --git a/conf/bblayers.conf.nvidia-logan.sample b/conf/bblayers.conf.nvidia-logan.sample deleted file mode 100644 index 9a7272c..0000000 --- a/conf/bblayers.conf.nvidia-logan.sample +++ /dev/null | |||
@@ -1,53 +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 | # POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf | ||
31 | # changes incompatibly | ||
32 | POKY_BBLAYERS_CONF_VERSION = "2" | ||
33 | |||
34 | BBPATH = "${TOPDIR}" | ||
35 | BBFILES ?= "" | ||
36 | BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" | ||
37 | |||
38 | BBLAYERS ?= " \ | ||
39 | ${BSPDIR}/sources/poky/meta \ | ||
40 | ${BSPDIR}/sources/poky/meta-poky \ | ||
41 | ${BSPDIR}/sources/nvidia-layer/meta-tegra \ | ||
42 | ${BSPDIR}/sources/nvidia-layer/meta-vib3 \ | ||
43 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ | ||
44 | ${BSPDIR}/sources/meta-openembedded/meta-python \ | ||
45 | ${BSPDIR}/sources/meta-openembedded/meta-networking \ | ||
46 | ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ | ||
47 | ${BSPDIR}/sources/meta-openembedded/meta-multimedia \ | ||
48 | ${BSPDIR}/sources/meta-boot2qt \ | ||
49 | ${BSPDIR}/sources/meta-boot2qt/meta-vib3-extras \ | ||
50 | ${BSPDIR}/sources/meta-boot2qt/meta-tegra-extras \ | ||
51 | ${BSPDIR}/sources/meta-mingw \ | ||
52 | ${BSPDIR}/sources/meta-qt5 \ | ||
53 | " | ||
diff --git a/conf/distro/include/nvidia-logan.conf b/conf/distro/include/nvidia-logan.conf deleted file mode 100644 index 0dc1d84..0000000 --- a/conf/distro/include/nvidia-logan.conf +++ /dev/null | |||
@@ -1,66 +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 | TARGET_CFLAGS += " -DWIN_INTERFACE_CUSTOM" | ||
31 | |||
32 | DEFAULTTUNE = "cortexa15hf-neon" | ||
33 | |||
34 | KERN_DIR ?= '${@os.path.normpath("${TOPDIR}/../sources/jetson-tk1-pro/vibrante-vcm30t124-linux")}' | ||
35 | PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/jetson-tk1-pro/vibrante-vcm30t124-linux")}' | ||
36 | NVLAYER_DIR ?= "${TOPDIR}/../sources/nvidia-layer" | ||
37 | |||
38 | MACHINE_EXTRA_INSTALL = "\ | ||
39 | libegl \ | ||
40 | libgles2 \ | ||
41 | tegra-firmware-gk20a \ | ||
42 | graphics-fw \ | ||
43 | libdrm-nv \ | ||
44 | " | ||
45 | |||
46 | MACHINE_EXTRA_INSTALL_SDK = "\ | ||
47 | libegl-dev \ | ||
48 | libgles2-dev \ | ||
49 | graphics-headers-dev \ | ||
50 | libdrm-nv-dev \ | ||
51 | " | ||
52 | |||
53 | PREFERRED_PROVIDER_libdrm ?= "libdrm-nv" | ||
54 | PREFERRED_PROVIDER_drm ?= "libdrm-nv" | ||
55 | |||
56 | BBMASK += "\ | ||
57 | meta-vib3/recipes-kernel/linux-libc-headers \ | ||
58 | meta-vib3/recipes-devtools/binutils \ | ||
59 | meta-vib3/recipes-core/eglibc \ | ||
60 | meta-vib3/recipes-core/systemd \ | ||
61 | meta-vib3/recipes-connectivity \ | ||
62 | meta-vib3/recipes-multimedia/pulseaudio \ | ||
63 | meta-vib3/recipes-core/meta \ | ||
64 | meta-vib3/recipes-core/packagegroups \ | ||
65 | meta-vib3/recipes-devtools/gcc \ | ||
66 | " | ||
diff --git a/conf/distro/include/tegra-t18x.conf b/conf/distro/include/tegra-t18x.conf index 515eb8d..f317ca9 100644 --- a/conf/distro/include/tegra-t18x.conf +++ b/conf/distro/include/tegra-t18x.conf | |||
@@ -20,15 +20,13 @@ | |||
20 | ## | 20 | ## |
21 | ############################################################################# | 21 | ############################################################################# |
22 | 22 | ||
23 | include conf/distro/include/tegra.inc | ||
24 | |||
25 | OLDEST_KERNEL_aarch64 = "3.18" | 23 | OLDEST_KERNEL_aarch64 = "3.18" |
26 | 24 | ||
27 | TARGET_CFLAGS += " -DWIN_INTERFACE_CUSTOM" | 25 | TARGET_CFLAGS += " -DWIN_INTERFACE_CUSTOM" |
28 | DISTRO_FEATURES_DEFAULT += "wayland" | 26 | DISTRO_FEATURES_DEFAULT += "wayland" |
29 | 27 | ||
30 | KERN_DIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186/kernel")}' | 28 | KERN_DIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186/kernel")}' |
31 | PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186/vibrante-t186ref-linux")}' | 29 | PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186")}' |
32 | NVLAYER_DIR ?= "${TOPDIR}/../sources/nvidia-layer" | 30 | NVLAYER_DIR ?= "${TOPDIR}/../sources/nvidia-layer" |
33 | 31 | ||
34 | MACHINE_EXTRA_INSTALL = "\ | 32 | MACHINE_EXTRA_INSTALL = "\ |
@@ -48,7 +46,6 @@ MACHINE_EXTRA_INSTALL = "\ | |||
48 | virtual/libegl \ | 46 | virtual/libegl \ |
49 | virtual/libgles2 \ | 47 | virtual/libgles2 \ |
50 | libdrm-nv \ | 48 | libdrm-nv \ |
51 | asound-conf \ | ||
52 | " | 49 | " |
53 | 50 | ||
54 | PREFERRED_PROVIDER_virtual/libgles2 ?= "tegra-drivers" | 51 | PREFERRED_PROVIDER_virtual/libgles2 ?= "tegra-drivers" |
@@ -60,21 +57,18 @@ PREFERRED_PROVIDER_virtual/libgl ?= "tegra-drivers" | |||
60 | PREFERRED_PROVIDER_virtual/libgles1 ?= "tegra-drivers" | 57 | PREFERRED_PROVIDER_virtual/libgles1 ?= "tegra-drivers" |
61 | PREFERRED_PROVIDER_virtual/mesa ?= "tegra-drivers" | 58 | PREFERRED_PROVIDER_virtual/mesa ?= "tegra-drivers" |
62 | 59 | ||
63 | PREFERRED_PROVIDER_wayland ?= "wayland-nv" | ||
64 | PREFERRED_PROVIDER_wayland-native ?= "wayland-nv" | ||
65 | PREFERRED_PROVIDER_nativesdk-wayland ?= "wayland-nv" | ||
66 | |||
67 | BBMASK += "\ | 60 | BBMASK += "\ |
68 | meta-vib4/recipes-connectivity/connman \ | 61 | meta-vib4/recipes-connectivity/connman \ |
69 | meta-vib4/recipes-core/busybox \ | 62 | meta-vib4/recipes-core/toybox \ |
70 | meta-vib4/recipes-core/images \ | 63 | meta-vib4/recipes-core/images \ |
71 | meta-vib4/recipes-core/meta \ | ||
72 | meta-vib4/recipes-core/packagegroups \ | 64 | meta-vib4/recipes-core/packagegroups \ |
73 | meta-vib4/recipes-core/systemd/systemd \ | ||
74 | meta-vib4/recipes-devtools \ | ||
75 | meta-vib4/recipes-extended \ | 65 | meta-vib4/recipes-extended \ |
76 | meta-vib4/recipes-multimedia/audiomanager \ | 66 | meta-vib4/recipes-multimedia/audiomanager \ |
77 | meta-vib4/recipes-core/glibc \ | 67 | meta-vib4/recipes-core/glibc \ |
78 | meta-vib4/recipes-support/lvm2 \ | 68 | meta-vib4/recipes-support/lvm2 \ |
79 | meta-vib4/recipes-kernel/linux-libc-headers \ | 69 | meta-vib4/recipes-kernel/linux-libc-headers \ |
70 | meta-vib4/recipes-devtools/binutils \ | ||
71 | meta-vib4/recipes-yocto-ivi/packagegroups \ | ||
72 | meta-vib4/recipes-graphics/wayland/wayland-ivi-extension_%.bbappend \ | ||
73 | meta-vib4/recipes-graphics/wayland/libinput_%.bbappend \ | ||
80 | " | 74 | " |
diff --git a/conf/distro/include/tegra.inc b/conf/distro/include/tegra.inc deleted file mode 100644 index 618a634..0000000 --- a/conf/distro/include/tegra.inc +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | python set_nv_drv_version () { | ||
2 | # Boiler plate code to setup bitbake objects | ||
3 | d = e.data | ||
4 | |||
5 | nv_drv_version = d.getVar('NV_DRV_VER', True) | ||
6 | if nv_drv_version != "ignore": | ||
7 | # FIXME: When we add support to internal builds, both debug and release | ||
8 | # builds will need to be considered | ||
9 | path = d.getVar('PLATFORM_TOPDIR', True) | ||
10 | get_nv_drv_cmd = "strings " + path + "/lib-target/nvidia_drv.so \ | ||
11 | | grep -o -P '(?<=Driver ).*(?=Release)' | awk {'print $1'}" | ||
12 | # Execute cmd | ||
13 | nv_drv_version = bb.process.run(get_nv_drv_cmd)[0].strip() | ||
14 | # Store returned value in NV_DRV_VER | ||
15 | d.setVar('NV_DRV_VER', nv_drv_version) | ||
16 | } | ||
17 | |||
diff --git a/meta-tegra-extras/recipes/libdrm-nv/libdrm-nv/libdrm.pc b/meta-tegra-extras/recipes/libdrm-nv/libdrm-nv/libdrm.pc deleted file mode 100644 index 6fe139e..0000000 --- a/meta-tegra-extras/recipes/libdrm-nv/libdrm-nv/libdrm.pc +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | prefix=/usr | ||
2 | exec_prefix=${prefix} | ||
3 | libdir=${exec_prefix}/lib | ||
4 | includedir=${prefix}/include | ||
5 | |||
6 | Name: libdrm | ||
7 | Description: Userspace interface to kernel DRM services | ||
8 | Version: 2.4.66 | ||
9 | Libs: -L${libdir} -ldrm | ||
10 | Cflags: -I${includedir} -I${includedir}/libdrm | ||
11 | |||
diff --git a/meta-tegra-extras/recipes/libdrm-nv/libdrm-nv_1.0.bbappend b/meta-tegra-extras/recipes/libdrm-nv/libdrm-nv_1.0.bbappend deleted file mode 100644 index f346a6b..0000000 --- a/meta-tegra-extras/recipes/libdrm-nv/libdrm-nv_1.0.bbappend +++ /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 | FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" | ||
31 | |||
32 | SRC_URI += " file://libdrm.pc" | ||
33 | SRC_URI_remove_nvidia-logan = "file://${PLATFORM_TOPDIR}/include/drm_fourcc.h" | ||
34 | |||
35 | do_install_append() { | ||
36 | install -d ${D}/usr/lib/pkgconfig | ||
37 | install -m 0776 ${WORKDIR}/libdrm.pc ${D}/usr/lib/pkgconfig/libdrm.pc | ||
38 | } | ||
39 | |||
40 | PACKAGES += "${PN}-dev" | ||
diff --git a/meta-vib3-extras/conf/layer.conf b/meta-vib3-extras/conf/layer.conf deleted file mode 100644 index 1a2dadb..0000000 --- a/meta-vib3-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_vib3" | ||
39 | BBFILE_PATTERN_b2qt_vib3 := "^${LAYERDIR}/" | ||
40 | BBFILE_PRIORITY_b2qt_vib3 = "20" | ||
diff --git a/meta-vib3-extras/recipes/graphics-fw/graphics-fw_1.0.bbappend b/meta-vib3-extras/recipes/graphics-fw/graphics-fw_1.0.bbappend deleted file mode 100644 index 30e2acc..0000000 --- a/meta-vib3-extras/recipes/graphics-fw/graphics-fw_1.0.bbappend +++ /dev/null | |||
@@ -1,34 +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 | SRC_URI_remove = " \ | ||
31 | file://${PLATFORM_TOPDIR}/lib-target/NETB_img.bin \ | ||
32 | file://${PLATFORM_TOPDIR}/lib-target/nvhost_msenc031.fw \ | ||
33 | file://${PLATFORM_TOPDIR}/lib-target/vic03_ucode.bin \ | ||
34 | " | ||
diff --git a/meta-vib3-extras/recipes/linux-libc-headers/linux-libc-headers_4.%.bbappend b/meta-vib3-extras/recipes/linux-libc-headers/linux-libc-headers_4.%.bbappend deleted file mode 100644 index 661e595..0000000 --- a/meta-vib3-extras/recipes/linux-libc-headers/linux-libc-headers_4.%.bbappend +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | |||
2 | # Use our kernel instead of yocto which defaults to mainline 3.10. | ||
3 | # Commit id of our kernel's include/uapi directory in kernel tree - | ||
4 | # 8c37e1bfe7dd26a9d4cf4510460a75264c906444 | ||
5 | SRC_URI = "file://${KERN_DIR}/linux.tar.bz2" | ||
6 | |||
7 | # Extracting linux.tar.bz2 creates directories | ||
8 | # <top>/vibrante-oss-src/kernel | ||
9 | S = "${WORKDIR}/vibrante-oss-src/kernel" | ||
10 | |||
11 | FILESEXTRAPATHS_prepend := "${THISDIR}/../linux/linux-nvidia:" | ||
12 | SRC_URI += "\ | ||
13 | file://0001-Btrfs-add-ioctl-to-wait-for-qgroup-rescan-completion.patch \ | ||
14 | " | ||
diff --git a/meta-vib3-extras/recipes/linux/linux-nvidia/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch b/meta-vib3-extras/recipes/linux/linux-nvidia/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch deleted file mode 100644 index ee61a74..0000000 --- a/meta-vib3-extras/recipes/linux/linux-nvidia/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch +++ /dev/null | |||
@@ -1,52 +0,0 @@ | |||
1 | From ef372125fd64fc181869be4cf528488f9e8b46c2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Behan Webster <behanw@converseincode.com> | ||
3 | Date: Wed, 24 Sep 2014 01:06:46 +0100 | ||
4 | Subject: [PATCH] ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h | ||
5 | |||
6 | With compilers which follow the C99 standard (like modern versions of gcc and | ||
7 | clang), "extern inline" does the wrong thing (emits code for an externally | ||
8 | linkable version of the inline function). In this case using static inline | ||
9 | and removing the NULL version of return_address in return_address.c does | ||
10 | the right thing. | ||
11 | |||
12 | Signed-off-by: Behan Webster <behanw@converseincode.com> | ||
13 | Reviewed-by: Mark Charlebois <charlebm@gmail.com> | ||
14 | Acked-by: Steven Rostedt <rostedt@goodmis.org> | ||
15 | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | ||
16 | --- | ||
17 | arch/arm/include/asm/ftrace.h | 2 +- | ||
18 | arch/arm/kernel/return_address.c | 5 ----- | ||
19 | 2 files changed, 1 insertion(+), 6 deletions(-) | ||
20 | |||
21 | diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h | ||
22 | index f89515a..2bb8cac 100644 | ||
23 | --- a/arch/arm/include/asm/ftrace.h | ||
24 | +++ b/arch/arm/include/asm/ftrace.h | ||
25 | @@ -45,7 +45,7 @@ void *return_address(unsigned int); | ||
26 | |||
27 | #else | ||
28 | |||
29 | -extern inline void *return_address(unsigned int level) | ||
30 | +static inline void *return_address(unsigned int level) | ||
31 | { | ||
32 | return NULL; | ||
33 | } | ||
34 | diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c | ||
35 | index fafedd8..f6aa84d 100644 | ||
36 | --- a/arch/arm/kernel/return_address.c | ||
37 | +++ b/arch/arm/kernel/return_address.c | ||
38 | @@ -63,11 +63,6 @@ void *return_address(unsigned int level) | ||
39 | #warning "TODO: return_address should use unwind tables" | ||
40 | #endif | ||
41 | |||
42 | -void *return_address(unsigned int level) | ||
43 | -{ | ||
44 | - return NULL; | ||
45 | -} | ||
46 | - | ||
47 | #endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */ | ||
48 | |||
49 | EXPORT_SYMBOL_GPL(return_address); | ||
50 | -- | ||
51 | 1.9.1 | ||
52 | |||
diff --git a/meta-vib3-extras/recipes/linux/linux-nvidia/0001-Btrfs-add-ioctl-to-wait-for-qgroup-rescan-completion.patch b/meta-vib3-extras/recipes/linux/linux-nvidia/0001-Btrfs-add-ioctl-to-wait-for-qgroup-rescan-completion.patch deleted file mode 100644 index b495d39..0000000 --- a/meta-vib3-extras/recipes/linux/linux-nvidia/0001-Btrfs-add-ioctl-to-wait-for-qgroup-rescan-completion.patch +++ /dev/null | |||
@@ -1,124 +0,0 @@ | |||
1 | From 57254b6ebce4ceca02d9c8b615f6059c56c19238 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jan Schmidt <list.btrfs@jan-o-sch.net> | ||
3 | Date: Mon, 6 May 2013 19:14:17 +0000 | ||
4 | Subject: [PATCH] Btrfs: add ioctl to wait for qgroup rescan completion | ||
5 | |||
6 | btrfs_qgroup_wait_for_completion waits until the currently running qgroup | ||
7 | operation completes. It returns immediately when no rescan process is in | ||
8 | progress. This is useful to automate things around the rescan process (e.g. | ||
9 | testing). | ||
10 | |||
11 | Signed-off-by: Jan Schmidt <list.btrfs@jan-o-sch.net> | ||
12 | Signed-off-by: Josef Bacik <jbacik@fusionio.com> | ||
13 | --- | ||
14 | fs/btrfs/ctree.h | 2 ++ | ||
15 | fs/btrfs/ioctl.c | 12 ++++++++++++ | ||
16 | fs/btrfs/qgroup.c | 21 +++++++++++++++++++++ | ||
17 | include/uapi/linux/btrfs.h | 1 + | ||
18 | 4 files changed, 36 insertions(+) | ||
19 | |||
20 | diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h | ||
21 | index a365400..e36e97b 100644 | ||
22 | --- a/fs/btrfs/ctree.h | ||
23 | +++ b/fs/btrfs/ctree.h | ||
24 | @@ -1613,6 +1613,7 @@ struct btrfs_fs_info { | ||
25 | struct mutex qgroup_rescan_lock; /* protects the progress item */ | ||
26 | struct btrfs_key qgroup_rescan_progress; | ||
27 | struct btrfs_workers qgroup_rescan_workers; | ||
28 | + struct completion qgroup_rescan_completion; | ||
29 | |||
30 | /* filesystem state */ | ||
31 | unsigned long fs_state; | ||
32 | @@ -3820,6 +3821,7 @@ int btrfs_quota_enable(struct btrfs_trans_handle *trans, | ||
33 | int btrfs_quota_disable(struct btrfs_trans_handle *trans, | ||
34 | struct btrfs_fs_info *fs_info); | ||
35 | int btrfs_qgroup_rescan(struct btrfs_fs_info *fs_info); | ||
36 | +int btrfs_qgroup_wait_for_completion(struct btrfs_fs_info *fs_info); | ||
37 | int btrfs_add_qgroup_relation(struct btrfs_trans_handle *trans, | ||
38 | struct btrfs_fs_info *fs_info, u64 src, u64 dst); | ||
39 | int btrfs_del_qgroup_relation(struct btrfs_trans_handle *trans, | ||
40 | diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c | ||
41 | index 0f81d67..1e0dda1 100644 | ||
42 | --- a/fs/btrfs/ioctl.c | ||
43 | +++ b/fs/btrfs/ioctl.c | ||
44 | @@ -3937,6 +3937,16 @@ static long btrfs_ioctl_quota_rescan_status(struct file *file, void __user *arg) | ||
45 | return ret; | ||
46 | } | ||
47 | |||
48 | +static long btrfs_ioctl_quota_rescan_wait(struct file *file, void __user *arg) | ||
49 | +{ | ||
50 | + struct btrfs_root *root = BTRFS_I(fdentry(file)->d_inode)->root; | ||
51 | + | ||
52 | + if (!capable(CAP_SYS_ADMIN)) | ||
53 | + return -EPERM; | ||
54 | + | ||
55 | + return btrfs_qgroup_wait_for_completion(root->fs_info); | ||
56 | +} | ||
57 | + | ||
58 | static long btrfs_ioctl_set_received_subvol(struct file *file, | ||
59 | void __user *arg) | ||
60 | { | ||
61 | @@ -4179,6 +4189,8 @@ long btrfs_ioctl(struct file *file, unsigned int | ||
62 | return btrfs_ioctl_quota_rescan(file, argp); | ||
63 | case BTRFS_IOC_QUOTA_RESCAN_STATUS: | ||
64 | return btrfs_ioctl_quota_rescan_status(file, argp); | ||
65 | + case BTRFS_IOC_QUOTA_RESCAN_WAIT: | ||
66 | + return btrfs_ioctl_quota_rescan_wait(file, argp); | ||
67 | case BTRFS_IOC_DEV_REPLACE: | ||
68 | return btrfs_ioctl_dev_replace(root, argp); | ||
69 | case BTRFS_IOC_GET_FSLABEL: | ||
70 | diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c | ||
71 | index 7f38cce..d059d86 100644 | ||
72 | --- a/fs/btrfs/qgroup.c | ||
73 | +++ b/fs/btrfs/qgroup.c | ||
74 | @@ -2070,6 +2070,8 @@ out: | ||
75 | } else { | ||
76 | pr_err("btrfs: qgroup scan failed with %d\n", err); | ||
77 | } | ||
78 | + | ||
79 | + complete_all(&fs_info->qgroup_rescan_completion); | ||
80 | } | ||
81 | |||
82 | static void | ||
83 | @@ -2110,6 +2112,7 @@ btrfs_qgroup_rescan(struct btrfs_fs_info *fs_info) | ||
84 | fs_info->qgroup_flags |= BTRFS_QGROUP_STATUS_FLAG_RESCAN; | ||
85 | memset(&fs_info->qgroup_rescan_progress, 0, | ||
86 | sizeof(fs_info->qgroup_rescan_progress)); | ||
87 | + init_completion(&fs_info->qgroup_rescan_completion); | ||
88 | |||
89 | /* clear all current qgroup tracking information */ | ||
90 | for (n = rb_first(&fs_info->qgroup_tree); n; n = rb_next(n)) { | ||
91 | @@ -2126,3 +2129,21 @@ btrfs_qgroup_rescan(struct btrfs_fs_info *fs_info) | ||
92 | |||
93 | return 0; | ||
94 | } | ||
95 | + | ||
96 | +int btrfs_qgroup_wait_for_completion(struct btrfs_fs_info *fs_info) | ||
97 | +{ | ||
98 | + int running; | ||
99 | + int ret = 0; | ||
100 | + | ||
101 | + mutex_lock(&fs_info->qgroup_rescan_lock); | ||
102 | + spin_lock(&fs_info->qgroup_lock); | ||
103 | + running = fs_info->qgroup_flags & BTRFS_QGROUP_STATUS_FLAG_RESCAN; | ||
104 | + spin_unlock(&fs_info->qgroup_lock); | ||
105 | + mutex_unlock(&fs_info->qgroup_rescan_lock); | ||
106 | + | ||
107 | + if (running) | ||
108 | + ret = wait_for_completion_interruptible( | ||
109 | + &fs_info->qgroup_rescan_completion); | ||
110 | + | ||
111 | + return ret; | ||
112 | +} | ||
113 | diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h | ||
114 | index 5ef0df5..5b683b5 100644 | ||
115 | --- a/include/uapi/linux/btrfs.h | ||
116 | +++ b/include/uapi/linux/btrfs.h | ||
117 | @@ -530,6 +530,7 @@ struct btrfs_ioctl_send_args { | ||
118 | struct btrfs_ioctl_quota_rescan_args) | ||
119 | #define BTRFS_IOC_QUOTA_RESCAN_STATUS _IOR(BTRFS_IOCTL_MAGIC, 45, \ | ||
120 | struct btrfs_ioctl_quota_rescan_args) | ||
121 | +#define BTRFS_IOC_QUOTA_RESCAN_WAIT _IO(BTRFS_IOCTL_MAGIC, 46) | ||
122 | #define BTRFS_IOC_GET_FSLABEL _IOR(BTRFS_IOCTL_MAGIC, 49, \ | ||
123 | char[BTRFS_LABEL_SIZE]) | ||
124 | #define BTRFS_IOC_SET_FSLABEL _IOW(BTRFS_IOCTL_MAGIC, 50, \ | ||
diff --git a/meta-vib3-extras/recipes/linux/linux-nvidia/0001-Change-extern-inline-to-static-inline.patch b/meta-vib3-extras/recipes/linux/linux-nvidia/0001-Change-extern-inline-to-static-inline.patch deleted file mode 100644 index 66f031f..0000000 --- a/meta-vib3-extras/recipes/linux/linux-nvidia/0001-Change-extern-inline-to-static-inline.patch +++ /dev/null | |||
@@ -1,133 +0,0 @@ | |||
1 | From 0873625fb43dda5a54919b7414f235cdfdd98ddc Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@theqtcompany.com> | ||
3 | Date: Wed, 13 Apr 2016 15:42:49 +0300 | ||
4 | Subject: [PATCH] Change "extern inline" to "static inline" | ||
5 | |||
6 | With compilers which follow the C99 standard (like modern versions of gcc and | ||
7 | clang), "extern inline" does the wrong thing (emits code for an externally | ||
8 | linkable version of the inline function). "static inline" is the correct choice | ||
9 | instead. | ||
10 | --- | ||
11 | drivers/staging/rtl8192u/ieee80211/ieee80211.h | 10 +++++----- | ||
12 | drivers/staging/rtl8712/ieee80211.h | 4 ++-- | ||
13 | lib/mpi/mpi-inline.h | 2 +- | ||
14 | lib/mpi/mpi-internal.h | 16 ++++++++-------- | ||
15 | 4 files changed, 16 insertions(+), 16 deletions(-) | ||
16 | |||
17 | diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h | ||
18 | index 502bfdb..1c8d026 100644 | ||
19 | --- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h | ||
20 | +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h | ||
21 | @@ -2254,7 +2254,7 @@ static inline void *ieee80211_priv(struct net_device *dev) | ||
22 | return ((struct ieee80211_device *)netdev_priv(dev))->priv; | ||
23 | } | ||
24 | |||
25 | -extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len) | ||
26 | +static inline int ieee80211_is_empty_essid(const char *essid, int essid_len) | ||
27 | { | ||
28 | /* Single white space is for Linksys APs */ | ||
29 | if (essid_len == 1 && essid[0] == ' ') | ||
30 | @@ -2270,7 +2270,7 @@ extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len) | ||
31 | return 1; | ||
32 | } | ||
33 | |||
34 | -extern inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mode) | ||
35 | +static inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mode) | ||
36 | { | ||
37 | /* | ||
38 | * It is possible for both access points and our device to support | ||
39 | @@ -2296,7 +2296,7 @@ extern inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mod | ||
40 | return 0; | ||
41 | } | ||
42 | |||
43 | -extern inline int ieee80211_get_hdrlen(u16 fc) | ||
44 | +static inline int ieee80211_get_hdrlen(u16 fc) | ||
45 | { | ||
46 | int hdrlen = IEEE80211_3ADDR_LEN; | ||
47 | |||
48 | @@ -2582,12 +2582,12 @@ void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee); | ||
49 | |||
50 | extern const long ieee80211_wlan_frequencies[]; | ||
51 | |||
52 | -extern inline void ieee80211_increment_scans(struct ieee80211_device *ieee) | ||
53 | +static inline void ieee80211_increment_scans(struct ieee80211_device *ieee) | ||
54 | { | ||
55 | ieee->scans++; | ||
56 | } | ||
57 | |||
58 | -extern inline int ieee80211_get_scans(struct ieee80211_device *ieee) | ||
59 | +static inline int ieee80211_get_scans(struct ieee80211_device *ieee) | ||
60 | { | ||
61 | return ieee->scans; | ||
62 | } | ||
63 | diff --git a/drivers/staging/rtl8712/ieee80211.h b/drivers/staging/rtl8712/ieee80211.h | ||
64 | index 21515c3..7518061 100644 | ||
65 | --- a/drivers/staging/rtl8712/ieee80211.h | ||
66 | +++ b/drivers/staging/rtl8712/ieee80211.h | ||
67 | @@ -734,7 +734,7 @@ enum ieee80211_state { | ||
68 | #define IEEE_G (1<<2) | ||
69 | #define IEEE_MODE_MASK (IEEE_A|IEEE_B|IEEE_G) | ||
70 | |||
71 | -extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len) | ||
72 | +static inline int ieee80211_is_empty_essid(const char *essid, int essid_len) | ||
73 | { | ||
74 | /* Single white space is for Linksys APs */ | ||
75 | if (essid_len == 1 && essid[0] == ' ') | ||
76 | @@ -748,7 +748,7 @@ extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len) | ||
77 | return 1; | ||
78 | } | ||
79 | |||
80 | -extern inline int ieee80211_get_hdrlen(u16 fc) | ||
81 | +static inline int ieee80211_get_hdrlen(u16 fc) | ||
82 | { | ||
83 | int hdrlen = 24; | ||
84 | |||
85 | diff --git a/lib/mpi/mpi-inline.h b/lib/mpi/mpi-inline.h | ||
86 | index e2b3985..c245ea3 100644 | ||
87 | --- a/lib/mpi/mpi-inline.h | ||
88 | +++ b/lib/mpi/mpi-inline.h | ||
89 | @@ -30,7 +30,7 @@ | ||
90 | #define G10_MPI_INLINE_H | ||
91 | |||
92 | #ifndef G10_MPI_INLINE_DECL | ||
93 | -#define G10_MPI_INLINE_DECL extern inline | ||
94 | +#define G10_MPI_INLINE_DECL static inline | ||
95 | #endif | ||
96 | |||
97 | G10_MPI_INLINE_DECL mpi_limb_t | ||
98 | diff --git a/lib/mpi/mpi-internal.h b/lib/mpi/mpi-internal.h | ||
99 | index 77adcf6..4566d11 100644 | ||
100 | --- a/lib/mpi/mpi-internal.h | ||
101 | +++ b/lib/mpi/mpi-internal.h | ||
102 | @@ -172,20 +172,20 @@ void mpi_rshift_limbs(MPI a, unsigned int count); | ||
103 | int mpi_lshift_limbs(MPI a, unsigned int count); | ||
104 | |||
105 | /*-- mpihelp-add.c --*/ | ||
106 | -mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, | ||
107 | - mpi_size_t s1_size, mpi_limb_t s2_limb); | ||
108 | +//mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, | ||
109 | +// mpi_size_t s1_size, mpi_limb_t s2_limb); | ||
110 | mpi_limb_t mpihelp_add_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, | ||
111 | mpi_ptr_t s2_ptr, mpi_size_t size); | ||
112 | -mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size, | ||
113 | - mpi_ptr_t s2_ptr, mpi_size_t s2_size); | ||
114 | +//mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size, | ||
115 | +// mpi_ptr_t s2_ptr, mpi_size_t s2_size); | ||
116 | |||
117 | /*-- mpihelp-sub.c --*/ | ||
118 | -mpi_limb_t mpihelp_sub_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, | ||
119 | - mpi_size_t s1_size, mpi_limb_t s2_limb); | ||
120 | +//mpi_limb_t mpihelp_sub_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, | ||
121 | +// mpi_size_t s1_size, mpi_limb_t s2_limb); | ||
122 | mpi_limb_t mpihelp_sub_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, | ||
123 | mpi_ptr_t s2_ptr, mpi_size_t size); | ||
124 | -mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size, | ||
125 | - mpi_ptr_t s2_ptr, mpi_size_t s2_size); | ||
126 | +//mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size, | ||
127 | +// mpi_ptr_t s2_ptr, mpi_size_t s2_size); | ||
128 | |||
129 | /*-- mpihelp-cmp.c --*/ | ||
130 | int mpihelp_cmp(mpi_ptr_t op1_ptr, mpi_ptr_t op2_ptr, mpi_size_t size); | ||
131 | -- | ||
132 | 1.9.1 | ||
133 | |||
diff --git a/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compile_error_in_tegra_drivers.patch b/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compile_error_in_tegra_drivers.patch deleted file mode 100644 index 8bbc38b..0000000 --- a/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compile_error_in_tegra_drivers.patch +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | --- a/drivers/platform/tegra/tegra_cl_dvfs.c 2016-04-19 13:05:46.897056724 +0300 | ||
2 | +++ b/drivers/platform/tegra/tegra_cl_dvfs.c 2016-04-19 12:55:28.053751626 +0300 | ||
3 | @@ -1021,7 +1021,7 @@ | ||
4 | |||
5 | static void cl_dvfs_calibrate(struct tegra_cl_dvfs *cld) | ||
6 | { | ||
7 | - u32 val, data; | ||
8 | + u32 val=0, data=0; | ||
9 | ktime_t now; | ||
10 | unsigned long rate; | ||
11 | unsigned long step = RATE_STEP(cld); | ||
12 | @@ -3303,7 +3303,7 @@ | ||
13 | |||
14 | static int monitor_get(void *data, u64 *val) | ||
15 | { | ||
16 | - u32 v, s; | ||
17 | + u32 v=0, s=0; | ||
18 | unsigned long flags; | ||
19 | struct clk *c = (struct clk *)data; | ||
20 | struct tegra_cl_dvfs *cld = ((struct clk *)data)->u.dfll.cl_dvfs; | ||
diff --git a/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compiler_error_in_tegra12_lock.patch b/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compiler_error_in_tegra12_lock.patch deleted file mode 100644 index fc8fe9f..0000000 --- a/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compiler_error_in_tegra12_lock.patch +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | --- a/drivers/platform/tegra/tegra12_clocks.c 2016-04-19 13:51:34.912235128 +0300 | ||
2 | +++ b/drivers/platform/tegra/tegra12_clocks.c 2016-04-19 13:51:55.739478254 +0300 | ||
3 | @@ -1331,7 +1331,7 @@ | ||
4 | */ | ||
5 | static void tegra12_cpu_clk_init(struct clk *c) | ||
6 | { | ||
7 | - c->state = (!is_lp_cluster() == (c->u.cpu.mode == MODE_G))? ON : OFF; | ||
8 | + c->state = ((!is_lp_cluster()) == (c->u.cpu.mode == MODE_G))? ON : OFF; | ||
9 | } | ||
10 | |||
11 | static int tegra12_cpu_clk_enable(struct clk *c) | ||
diff --git a/meta-vib3-extras/recipes/linux/linux-nvidia_3.10.bbappend b/meta-vib3-extras/recipes/linux/linux-nvidia_3.10.bbappend deleted file mode 100644 index ee2d5ba..0000000 --- a/meta-vib3-extras/recipes/linux/linux-nvidia_3.10.bbappend +++ /dev/null | |||
@@ -1,71 +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 | FILESEXTRAPATHS_prepend := "__default:${THISDIR}/${PN}:" | ||
31 | |||
32 | DEPENDS_remove = "external-tegra-toolchain" | ||
33 | do_kernel_defconfig[depends] = "kern-tools-native:do_populate_sysroot" | ||
34 | |||
35 | SRC_URI += "\ | ||
36 | file://0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch \ | ||
37 | file://0001-Change-extern-inline-to-static-inline.patch \ | ||
38 | file://Fix_compile_error_in_tegra_drivers.patch \ | ||
39 | file://Fix_compiler_error_in_tegra12_lock.patch \ | ||
40 | file://0001-Btrfs-add-ioctl-to-wait-for-qgroup-rescan-completion.patch \ | ||
41 | " | ||
42 | |||
43 | do_unpack_append() { | ||
44 | rm -rf ${STAGING_KERNEL_DIR} | ||
45 | ln -s ${S} ${STAGING_KERNEL_DIR} | ||
46 | } | ||
47 | |||
48 | do_compile_prepend () { | ||
49 | # Cross compiling exports | ||
50 | export ARCH=${TARGET_ARCH} | ||
51 | export CROSS_COMPILE=${CROSS_COMPILE} | ||
52 | |||
53 | echo "CONFIG_FHANDLE=y" >> ${B}/.config | ||
54 | make olddefconfig | ||
55 | } | ||
56 | |||
57 | do_install_append() { | ||
58 | s=$(readlink -m "${S}") | ||
59 | kernsrc="${STAGING_KERNEL_DIR}" | ||
60 | |||
61 | if [ "${s}" != "${kernsrc}" ]; then | ||
62 | mkdir -p "${kernsrc}" | ||
63 | rm -rf "${kernsrc}" | ||
64 | mv "${S}" "${STAGING_KERNEL_DIR}" | ||
65 | ln -sf "${kernsrc}" "${s}" | ||
66 | fi | ||
67 | } | ||
68 | |||
69 | python do_patch () { | ||
70 | bb.build.exec_func('patch_do_patch', d) | ||
71 | } | ||
diff --git a/meta-vib4-extras/recipes/systemd/systemd/tegra-t18x/0001-Disable-LTO-in-LDFLAGS-and-CFLAGS.patch b/meta-vib4-extras/recipes/systemd/systemd/tegra-t18x/0001-Disable-LTO-in-LDFLAGS-and-CFLAGS.patch deleted file mode 100644 index 629ccf4..0000000 --- a/meta-vib4-extras/recipes/systemd/systemd/tegra-t18x/0001-Disable-LTO-in-LDFLAGS-and-CFLAGS.patch +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | diff --git a/configure.ac b/configure.ac | ||
2 | index 97a29d6..b0e4060 100644 | ||
3 | --- a/configure.ac | ||
4 | +++ b/configure.ac | ||
5 | @@ -208,10 +208,6 @@ AS_CASE([$CC], [*clang*], | ||
6 | -Wno-gnu-variable-sized-type-not-at-end \ | ||
7 | ])]) | ||
8 | |||
9 | -AS_CASE([$CFLAGS], [*-O[[12345sz\ ]]*], | ||
10 | - [CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\ | ||
11 | - -flto -ffat-lto-objects])], | ||
12 | - [AC_MSG_RESULT([skipping -flto, optimization not enabled])]) | ||
13 | AC_SUBST([OUR_CFLAGS], "$with_cflags $sanitizer_cflags") | ||
14 | |||
15 | AS_CASE([$CFLAGS], [*-O[[12345\ ]]*], | ||
16 | -- | ||
17 | 2.5.0 | ||
18 | |||
diff --git a/meta-vib4-extras/recipes/systemd/systemd_%.bbappend b/meta-vib4-extras/recipes/systemd/systemd_%.bbappend index dbeb030..53ea1e4 100644 --- a/meta-vib4-extras/recipes/systemd/systemd_%.bbappend +++ b/meta-vib4-extras/recipes/systemd/systemd_%.bbappend | |||
@@ -27,4 +27,4 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 30 | SRC_URI_remove = "file://0001-Disable-LTO-in-LDFLAGS-and-CFLAGS.patch" |
diff --git a/meta-vib4-extras/recipes/wayland-nv/wayland-nv.bbappend b/meta-vib4-extras/recipes/wayland-nv/wayland-nv.bbappend deleted file mode 100644 index f892961..0000000 --- a/meta-vib4-extras/recipes/wayland-nv/wayland-nv.bbappend +++ /dev/null | |||
@@ -1,49 +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 | FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" | ||
31 | |||
32 | SRC_URI += " \ | ||
33 | file://wayland-client.pc \ | ||
34 | file://wayland-cursor.pc \ | ||
35 | file://wayland-egl.pc \ | ||
36 | file://wayland-server.pc \ | ||
37 | file://${PLATFORM_TOPDIR}/include/wayland-egl-core.h \ | ||
38 | " | ||
39 | |||
40 | FILES_${PN} += "${libdir}/pkgconfig" | ||
41 | |||
42 | WAYLAND_PACKAGES += "wayland-dev" | ||
43 | |||
44 | do_install_append() { | ||
45 | install -d ${D}${libdir}/pkgconfig | ||
46 | install -m 0776 ${WORKDIR}/*.pc ${D}${libdir}/pkgconfig | ||
47 | install -d ${D}${includedir} | ||
48 | install -m 0775 ${PLATFORM_TOPDIR}/include/wayland-egl-core.h ${D}${includedir} | ||
49 | } | ||
diff --git a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-client.pc b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-client.pc deleted file mode 100644 index e639768..0000000 --- a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-client.pc +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | prefix=/usr | ||
2 | exec_prefix=/usr | ||
3 | datarootdir=${prefix}/share | ||
4 | pkgdatadir=/usr/share/wayland | ||
5 | libdir=/usr/lib | ||
6 | includedir=/usr/include | ||
7 | |||
8 | Name: Wayland Client | ||
9 | Description: Wayland client side library | ||
10 | Version: 1.6.0 | ||
11 | Cflags: -I${includedir} | ||
12 | Libs: -L${libdir} -lwayland-client | ||
diff --git a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-cursor.pc b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-cursor.pc deleted file mode 100644 index 36538ad..0000000 --- a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-cursor.pc +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | prefix=/usr | ||
2 | exec_prefix=/usr | ||
3 | libdir=/usr/lib | ||
4 | includedir=/usr/include | ||
5 | |||
6 | Name: Wayland Cursor | ||
7 | Description: Wayland cursor helper library | ||
8 | Version: 1.6.0 | ||
9 | Cflags: -I${includedir} | ||
10 | Libs: -L${libdir} -lwayland-cursor | ||
diff --git a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-egl.pc b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-egl.pc deleted file mode 100644 index dc8393f..0000000 --- a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-egl.pc +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | prefix=/usr | ||
2 | exec_prefix=/usr | ||
3 | libdir=/usr/lib | ||
4 | includedir=/usr/include | ||
5 | |||
6 | Name: wayland-egl | ||
7 | Description: wayland-egl library | ||
8 | Version: 9.1.6 | ||
9 | Libs: -L${libdir} -lwayland-egl | ||
10 | Cflags: -I${includedir} | ||
11 | |||
diff --git a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-server.pc b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-server.pc deleted file mode 100644 index dab87b9..0000000 --- a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-server.pc +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | prefix=/usr | ||
2 | exec_prefix=/usr | ||
3 | datarootdir=${prefix}/share | ||
4 | pkgdatadir=/usr/share/wayland | ||
5 | libdir=/usr/lib | ||
6 | includedir=/usr/include | ||
7 | |||
8 | Name: Wayland Server | ||
9 | Description: Server side implementation of the Wayland protocol | ||
10 | Version: 1.6.0 | ||
11 | Cflags: -I${includedir} | ||
12 | Libs: -L${libdir} -lwayland-server | ||
diff --git a/meta-vib4-extras/recipes/wayland/wayland/always-build-scanner.patch b/meta-vib4-extras/recipes/wayland/wayland/always-build-scanner.patch new file mode 100644 index 0000000..5e0e6bf --- /dev/null +++ b/meta-vib4-extras/recipes/wayland/wayland/always-build-scanner.patch | |||
@@ -0,0 +1,105 @@ | |||
1 | build: always build wayland-scanner | ||
2 | |||
3 | The previous idiom for building a cross-compiled Wayland is to build once for | ||
4 | the build host (with --enable-scanner --disable-libraries) to get a | ||
5 | wayland-scanner binary that can then be used in a cross-compile (with | ||
6 | --disable-scanner). The problem with this is that the cross wayland is missing | ||
7 | a wayland-scanner binary, which means you then can't do any Wayland development | ||
8 | on the target. | ||
9 | |||
10 | Instead, always build wayland-scanner for the target and change | ||
11 | --enable/disable-scanner to --with/without-host-scanner. Normal builds use the | ||
12 | default of --without-host-scanner and run the wayland-scanner it just built, and | ||
13 | cross-compiled builds pass --with-host-scanner to use a previously built host | ||
14 | scanner but still get a wayland-scanner to install. | ||
15 | |||
16 | (a theoretically neater solution would be to build two scanners if required (one | ||
17 | to run and one to install), but automake makes this overly complicated) | ||
18 | |||
19 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
20 | Upstream-Status: Submitted | ||
21 | |||
22 | diff --git a/Makefile.am b/Makefile.am | ||
23 | index c19494f..c2d929b 100644 | ||
24 | --- a/Makefile.am | ||
25 | +++ b/Makefile.am | ||
26 | @@ -64,16 +64,17 @@ nodist_libwayland_client_la_SOURCES = \ | ||
27 | |||
28 | pkgconfig_DATA += src/wayland-client.pc src/wayland-server.pc | ||
29 | |||
30 | -if ENABLE_SCANNER | ||
31 | -wayland_scanner = $(top_builddir)/wayland-scanner | ||
32 | bin_PROGRAMS = wayland-scanner | ||
33 | wayland_scanner_SOURCES = src/scanner.c | ||
34 | wayland_scanner_CFLAGS = $(EXPAT_CFLAGS) $(AM_CFLAGS) | ||
35 | wayland_scanner_LDADD = $(EXPAT_LIBS) libwayland-util.la | ||
36 | -$(BUILT_SOURCES) : wayland-scanner | ||
37 | pkgconfig_DATA += src/wayland-scanner.pc | ||
38 | -else | ||
39 | + | ||
40 | +if HOST_SCANNER | ||
41 | wayland_scanner = wayland-scanner | ||
42 | +else | ||
43 | +$(BUILT_SOURCES) : wayland-scanner | ||
44 | +wayland_scanner = $(top_builddir)/wayland-scanner | ||
45 | endif | ||
46 | |||
47 | protocol/%-protocol.c : $(top_srcdir)/protocol/%.xml | ||
48 | diff --git a/configure.ac b/configure.ac | ||
49 | index c2a804e..de0b02f 100644 | ||
50 | --- a/configure.ac | ||
51 | +++ b/configure.ac | ||
52 | @@ -65,11 +65,11 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[], | ||
53 | [[#include <time.h>]]) | ||
54 | AC_CHECK_HEADERS([execinfo.h]) | ||
55 | |||
56 | -AC_ARG_ENABLE([scanner], | ||
57 | - [AC_HELP_STRING([--disable-scanner], | ||
58 | - [Disable compilation of wayland-scanner])], | ||
59 | - [], | ||
60 | - [enable_scanner=yes]) | ||
61 | +AC_ARG_WITH([host-scanner], | ||
62 | + [AC_HELP_STRING([--with-host-scanner], | ||
63 | + [Use a host wayland-scanner])], | ||
64 | + [], | ||
65 | + [with_host_scanner=no]) | ||
66 | |||
67 | AC_ARG_ENABLE([documentation], | ||
68 | [AC_HELP_STRING([--disable-documentation], | ||
69 | @@ -77,25 +77,23 @@ AC_ARG_ENABLE([documentation], | ||
70 | [], | ||
71 | [enable_documentation=yes]) | ||
72 | |||
73 | -AM_CONDITIONAL(ENABLE_SCANNER, test "x$enable_scanner" = xyes) | ||
74 | +AM_CONDITIONAL(HOST_SCANNER, test "x$with_host_scanner" = xyes) | ||
75 | |||
76 | AC_ARG_WITH(icondir, [ --with-icondir=<dir> Look for cursor icons here], | ||
77 | [ ICONDIR=$withval], | ||
78 | [ ICONDIR=${datadir}/icons]) | ||
79 | AC_SUBST([ICONDIR]) | ||
80 | |||
81 | -if test "x$enable_scanner" = "xyes"; then | ||
82 | - PKG_CHECK_MODULES(EXPAT, [expat], [], | ||
83 | - [AC_CHECK_HEADERS(expat.h, [], | ||
84 | - [AC_MSG_ERROR([Can't find expat.h. Please install expat.])]) | ||
85 | - SAVE_LIBS="$LIBS" | ||
86 | - AC_SEARCH_LIBS(XML_ParserCreate, expat, [], | ||
87 | - [AC_MSG_ERROR([Can't find expat library. Please install expat.])]) | ||
88 | - EXPAT_LIBS="$LIBS" | ||
89 | - LIBS="$SAVE_LIBS" | ||
90 | - AC_SUBST(EXPAT_LIBS) | ||
91 | - ]) | ||
92 | -fi | ||
93 | +PKG_CHECK_MODULES(EXPAT, [expat], [], | ||
94 | + [AC_CHECK_HEADERS(expat.h, [], | ||
95 | + [AC_MSG_ERROR([Can't find expat.h. Please install expat.])]) | ||
96 | + SAVE_LIBS="$LIBS" | ||
97 | + AC_SEARCH_LIBS(XML_ParserCreate, expat, [], | ||
98 | + [AC_MSG_ERROR([Can't find expat library. Please install expat.])]) | ||
99 | + EXPAT_LIBS="$LIBS" | ||
100 | + LIBS="$SAVE_LIBS" | ||
101 | + AC_SUBST(EXPAT_LIBS) | ||
102 | + ]) | ||
103 | |||
104 | AC_PATH_PROG(XSLTPROC, xsltproc) | ||
105 | AM_CONDITIONAL([HAVE_XSLTPROC], [test "x$XSLTPROC" != "x"]) | ||
diff --git a/meta-vib3-extras/recipes/qt5/qtbase_git.bbappend b/meta-vib4-extras/recipes/wayland/wayland_%.bbappend index 4abb469..463d5a1 100644 --- a/meta-vib3-extras/recipes/qt5/qtbase_git.bbappend +++ b/meta-vib4-extras/recipes/wayland/wayland_%.bbappend | |||
@@ -27,5 +27,10 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | DEPENDS += "graphics-headers" | 30 | FILESEXTRAPATHS_append := ":${NVLAYER_DIR}/packages:${LNX_TOPDIR}/${PN}:${THISDIR}/${PN}" |
31 | PACKAGECONFIG += "kms" | 31 | |
32 | SRC_URI_remove = "file://${NVLAYER_DIR}/packages/wayland-1.8.1-src.tar.gz" | ||
33 | SRC_URI = "\ | ||
34 | file://wayland-1.8.1-src.tar.gz \ | ||
35 | file://always-build-scanner.patch \ | ||
36 | " | ||
diff --git a/meta-vib4-extras/recipes/weston/weston/disable-wayland-scanner-pkg-check.patch b/meta-vib4-extras/recipes/weston/weston/disable-wayland-scanner-pkg-check.patch new file mode 100644 index 0000000..062da5c --- /dev/null +++ b/meta-vib4-extras/recipes/weston/weston/disable-wayland-scanner-pkg-check.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Index: weston-1.5.0/configure.ac | ||
2 | =================================================================== | ||
3 | --- weston-1.5.0.orig/configure.ac | ||
4 | +++ weston-1.5.0/configure.ac | ||
5 | @@ -503,7 +503,7 @@ if test x$wayland_scanner = x; then | ||
6 | AC_MSG_ERROR([wayland-scanner is needed to compile weston]) | ||
7 | fi | ||
8 | |||
9 | -PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner) | ||
10 | +#PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner) | ||
11 | |||
12 | AC_CONFIG_FILES([Makefile src/version.h src/weston.pc]) | ||
13 | |||
diff --git a/meta-vib4-extras/recipes/weston/weston-nv.bbappend b/meta-vib4-extras/recipes/weston/weston_%.bbappend index 31b1ad1..cfc286f 100644 --- a/meta-vib4-extras/recipes/weston/weston-nv.bbappend +++ b/meta-vib4-extras/recipes/weston/weston_%.bbappend | |||
@@ -27,6 +27,10 @@ | |||
27 | ## | 27 | ## |
28 | ############################################################################ | 28 | ############################################################################ |
29 | 29 | ||
30 | FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" | ||
31 | S = "${WORKDIR}/${LNX_TOPDIR}/samples/wayland/weston" | ||
32 | |||
30 | do_install_prepend() { | 33 | do_install_prepend() { |
31 | mv ${WORKDIR}/prebuilt/* ${WORKDIR}/ | 34 | mkdir -p ${WORKDIR}/${LNX_TOPDIR}/samples/weston/tools |
35 | cp ${WORKDIR}/${LNX_TOPDIR}/samples/wayland/weston/tools/weston.ini ${WORKDIR}/${LNX_TOPDIR}/samples/weston/tools/weston.ini | ||
32 | } | 36 | } |
diff --git a/scripts/manifest.xml b/scripts/manifest.xml index e6a423c..afbc05c 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml | |||
@@ -69,17 +69,12 @@ | |||
69 | 69 | ||
70 | <project name="nvidia-layer" | 70 | <project name="nvidia-layer" |
71 | remote="playground" | 71 | remote="playground" |
72 | revision="38c9b1d76037ff39b9e0cbd679b3e04b36c86ed7" | 72 | revision="7c95fabf8d71617130f71464207dd55c3079facd" |
73 | path="sources/nvidia-layer" | 73 | path="sources/nvidia-layer" |
74 | groups="notdefault,internal"/> | 74 | groups="notdefault,internal"/> |
75 | <project name="jetson-tk1-pro" | ||
76 | remote="playground" | ||
77 | revision="a376c795d5361fda4ea5f19feecc23ab7e753646" | ||
78 | path="sources/jetson-tk1-pro" | ||
79 | groups="notdefault,internal"/> | ||
80 | <project name="vibrante-t186" | 75 | <project name="vibrante-t186" |
81 | remote="playground" | 76 | remote="playground" |
82 | revision="edc10bf3f4b17333021f85e9ad32f85838e2c33f" | 77 | revision="e947e8f412b41ef673714e752a4065dc2f4fb04e" |
83 | path="sources/vibrante-t186" | 78 | path="sources/vibrante-t186" |
84 | groups="notdefault,internal"/> | 79 | groups="notdefault,internal"/> |
85 | <project name="meta-smx6" | 80 | <project name="meta-smx6" |
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh index 5825bf1..1a72d28 100755 --- a/scripts/setup-environment.sh +++ b/scripts/setup-environment.sh | |||
@@ -77,9 +77,6 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then | |||
77 | intel-corei7-64) | 77 | intel-corei7-64) |
78 | LAYERSCONF="bblayers.conf.intel.sample" | 78 | LAYERSCONF="bblayers.conf.intel.sample" |
79 | ;; | 79 | ;; |
80 | nvidia-logan) | ||
81 | LAYERSCONF="bblayers.conf.nvidia-logan.sample" | ||
82 | ;; | ||
83 | tegra-x1|tegra-t18x) | 80 | tegra-x1|tegra-t18x) |
84 | LAYERSCONF="bblayers.conf.nvidia-tegra.sample" | 81 | LAYERSCONF="bblayers.conf.nvidia-tegra.sample" |
85 | ;; | 82 | ;; |
diff --git a/scripts/upload.sh b/scripts/upload.sh index af7e1f2..5048797 100755 --- a/scripts/upload.sh +++ b/scripts/upload.sh | |||
@@ -41,7 +41,7 @@ elif [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.img | |||
41 | 7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \ | 41 | 7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \ |
42 | $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.img \ | 42 | $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.img \ |
43 | $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.conf | 43 | $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.conf |
44 | elif ([ ${MACHINE} = "nvidia-logan" ] || [ ${MACHINE} = "tegra-x1" ] || [ ${MACHINE} = "tegra-t18x" ]) \ | 44 | elif ([ ${MACHINE} = "tegra-x1" ] || [ ${MACHINE} = "tegra-t18x" ]) \ |
45 | && [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz ]; then | 45 | && [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz ]; then |
46 | 7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \ | 46 | 7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \ |
47 | $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz \ | 47 | $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz \ |