summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf4
-rw-r--r--meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf3
-rw-r--r--meta-boot2qt-distro/conf/distro/include/jetson.inc5
-rw-r--r--meta-boot2qt-distro/conf/distro/include/toradex.inc8
-rw-r--r--meta-boot2qt-distro/conf/layer.conf3
-rw-r--r--meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend16
-rw-r--r--meta-boot2qt/conf/layer.conf2
-rw-r--r--meta-boot2qt/recipes-core/ostree/ostree/0001-libglnx.m4-Include-stdio.h-for-renameat2.patch26
-rw-r--r--meta-boot2qt/recipes-core/ostree/ostree_git.bb14
-rw-r--r--meta-fsl-extras/conf/layer.conf2
-rw-r--r--meta-fsl-extras/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.0.bb35
-rw-r--r--meta-fsl-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.0.bb35
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch70
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-toradex/0003-apalis-imx6-Ixora-v1.0-support.patch32
-rw-r--r--meta-intel-extras/conf/layer.conf2
-rw-r--r--meta-raspberrypi-extras/conf/layer.conf2
-rw-r--r--meta-raspberrypi-extras/recipes/userland/userland/0001-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch34
-rw-r--r--meta-tegra-extras/conf/layer.conf2
-rw-r--r--meta-toradex-extras/conf/layer.conf6
-rw-r--r--meta-toradex-extras/recipes/systemd/systemd/0001-systemd-udevd.service.in-set-MountFlags-shared.patch22
-rw-r--r--meta-toradex-extras/recipes/systemd/systemd_%.bbappend (renamed from meta-raspberrypi-extras/recipes/userland/userland_git.bbappend)10
-rw-r--r--scripts/manifest.xml16
22 files changed, 214 insertions, 135 deletions
diff --git a/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf b/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf
index 98fb529..b4f4eef 100644
--- a/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf
+++ b/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf
@@ -44,7 +44,3 @@ SERIAL_CONSOLES = "115200;ttymxc0 \
44 115200;ttymxc1" 44 115200;ttymxc1"
45 45
46KERNEL_MODULE_AUTOLOAD += "atmel_mxt_ts" 46KERNEL_MODULE_AUTOLOAD += "atmel_mxt_ts"
47
48PREFERRED_VERSION_imx-gpu-viv = "6.2.4.p1.2-aarch32"
49PREFERRED_VERSION_imx-gpu-g2d = "6.2.4.p1.2"
50PREFERRED_VERSION_kernel-module-imx-gpu-viv = "6.2.4.p1.2"
diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf
index 1fade70..265d24f 100644
--- a/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf
@@ -40,6 +40,3 @@ IMAGE_BOOT_FILES += " \
40 SPL-${MACHINE}-spl;${MACHINEDIR}/SPL \ 40 SPL-${MACHINE}-spl;${MACHINEDIR}/SPL \
41 " 41 "
42 42
43PREFERRED_VERSION_imx-gpu-viv = "6.2.4.p1.2-aarch32"
44PREFERRED_VERSION_imx-gpu-g2d = "6.2.4.p1.2"
45PREFERRED_VERSION_kernel-module-imx-gpu-viv = "6.2.4.p1.2"
diff --git a/meta-boot2qt-distro/conf/distro/include/jetson.inc b/meta-boot2qt-distro/conf/distro/include/jetson.inc
index 3212cb9..b2b38ff 100644
--- a/meta-boot2qt-distro/conf/distro/include/jetson.inc
+++ b/meta-boot2qt-distro/conf/distro/include/jetson.inc
@@ -1,6 +1,6 @@
1############################################################################ 1############################################################################
2## 2##
3## Copyright (C) 2018 The Qt Company Ltd. 3## Copyright (C) 2019 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/ 4## Contact: https://www.qt.io/licensing/
5## 5##
6## This file is part of the Boot to Qt meta layer. 6## This file is part of the Boot to Qt meta layer.
@@ -41,3 +41,6 @@ QBSP_IMAGE_CONTENT = "\
41 ${IMAGE_LINK_NAME}.conf \ 41 ${IMAGE_LINK_NAME}.conf \
42 ${IMAGE_LINK_NAME}.flasher.tar.gz \ 42 ${IMAGE_LINK_NAME}.flasher.tar.gz \
43 " 43 "
44
45# NVIDIA's Vulkan support is for X only
46DISTRO_FEATURES_remove = "vulkan"
diff --git a/meta-boot2qt-distro/conf/distro/include/toradex.inc b/meta-boot2qt-distro/conf/distro/include/toradex.inc
index 9a252d0..12a1999 100644
--- a/meta-boot2qt-distro/conf/distro/include/toradex.inc
+++ b/meta-boot2qt-distro/conf/distro/include/toradex.inc
@@ -1,6 +1,6 @@
1############################################################################ 1############################################################################
2## 2##
3## Copyright (C) 2017 The Qt Company Ltd. 3## Copyright (C) 2019 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/ 4## Contact: https://www.qt.io/licensing/
5## 5##
6## This file is part of the Boot to Qt meta layer. 6## This file is part of the Boot to Qt meta layer.
@@ -34,8 +34,10 @@ require conf/machine/include/${MACHINE}.inc
34 34
35BBMASK += "\ 35BBMASK += "\
36 meta-toradex-nxp/recipes-graphics/xorg-xserver \ 36 meta-toradex-nxp/recipes-graphics/xorg-xserver \
37 meta-toradex-nxp/recipes-multimedia/gstreamer \
37 meta-toradex-bsp-common/recipes-devtools/python \ 38 meta-toradex-bsp-common/recipes-devtools/python \
38 meta-toradex-bsp-common/recipes-devtools/e2fsprogs \ 39 meta-toradex-bsp-common/recipes-devtools/e2fsprogs \
40 meta-toradex-bsp-common/recipes-core/systemd \
39 " 41 "
40 42
41PREFERRED_PROVIDER_u-boot = "u-boot-toradex" 43PREFERRED_PROVIDER_u-boot = "u-boot-toradex"
@@ -49,3 +51,7 @@ IMAGE_BOOT_FILES += " \
49 fwd_mmc.img;flash_mmc.img \ 51 fwd_mmc.img;flash_mmc.img \
50 ${MACHINE}/*;${MACHINEDIR}/ \ 52 ${MACHINE}/*;${MACHINEDIR}/ \
51 " 53 "
54
55# use 1.14.0 that matches the imx version of gstreamer
56PREFERRED_VERSION_gstreamer1.0-plugins-ugly = "1.14.0"
57PREFERRED_VERSION_gstreamer1.0-libav = "1.14.0"
diff --git a/meta-boot2qt-distro/conf/layer.conf b/meta-boot2qt-distro/conf/layer.conf
index d9ededa..4a6a22e 100644
--- a/meta-boot2qt-distro/conf/layer.conf
+++ b/meta-boot2qt-distro/conf/layer.conf
@@ -34,10 +34,9 @@ BBPATH .= ":${LAYERDIR}"
34BBFILES += "${LAYERDIR}/recipes*/*/*.bb \ 34BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
35 ${LAYERDIR}/recipes*/*/*.bbappend \ 35 ${LAYERDIR}/recipes*/*/*.bbappend \
36 " 36 "
37BBMASK += "meta-qt5/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_%.bbappend"
38 37
39BBFILE_COLLECTIONS += "b2qt-distro" 38BBFILE_COLLECTIONS += "b2qt-distro"
40BBFILE_PATTERN_b2qt-distro := "^${LAYERDIR}/" 39BBFILE_PATTERN_b2qt-distro := "^${LAYERDIR}/"
41BBFILE_PRIORITY_b2qt-distro = "20" 40BBFILE_PRIORITY_b2qt-distro = "20"
42 41
43LAYERSERIES_COMPAT_b2qt-distro = "sumo" 42LAYERSERIES_COMPAT_b2qt-distro = "thud"
diff --git a/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
index 0271b6d..37c9ca7 100644
--- a/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
+++ b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
@@ -28,19 +28,3 @@
28############################################################################ 28############################################################################
29 29
30PACKAGECONFIG_append = " faad" 30PACKAGECONFIG_append = " faad"
31
32inherit qmake5_paths
33
34PACKAGECONFIG[qt5] = '--enable-qt \
35 --with-moc="${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc" \
36 --with-uic="${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/uic" \
37 --with-rcc="${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/rcc" \
38 ,--disable-qt,qtbase qtdeclarative qtbase-native'
39
40# The GStreamer Qt5 plugin needs desktop OpenGL or OpenGL ES to work, so make sure it is enabled
41python() {
42 cur_packageconfig = d.getVar('PACKAGECONFIG',True).split()
43 if 'qt5' in cur_packageconfig and not (('opengl' in cur_packageconfig) or ('gles2' in cur_packageconfig)):
44 gl_packageconfig = d.getVar('PACKAGECONFIG_GL',True)
45 d.appendVar('PACKAGECONFIG', ' ' + gl_packageconfig)
46}
diff --git a/meta-boot2qt/conf/layer.conf b/meta-boot2qt/conf/layer.conf
index c51ea68..fb87975 100644
--- a/meta-boot2qt/conf/layer.conf
+++ b/meta-boot2qt/conf/layer.conf
@@ -44,4 +44,4 @@ B2QTBASE = "${LAYERDIR}"
44 44
45HOSTTOOLS += "git-lfs" 45HOSTTOOLS += "git-lfs"
46 46
47LAYERSERIES_COMPAT_b2qt = "sumo" 47LAYERSERIES_COMPAT_b2qt = "thud"
diff --git a/meta-boot2qt/recipes-core/ostree/ostree/0001-libglnx.m4-Include-stdio.h-for-renameat2.patch b/meta-boot2qt/recipes-core/ostree/ostree/0001-libglnx.m4-Include-stdio.h-for-renameat2.patch
new file mode 100644
index 0000000..f7be40e
--- /dev/null
+++ b/meta-boot2qt/recipes-core/ostree/ostree/0001-libglnx.m4-Include-stdio.h-for-renameat2.patch
@@ -0,0 +1,26 @@
1From aa04ed9af553b979b19ef31a9ea2241789a15a60 Mon Sep 17 00:00:00 2001
2From: Colin Walters <walters@verbum.org>
3Date: Wed, 11 Jul 2018 14:56:32 -0400
4Subject: [PATCH] libglnx.m4: Include stdio.h for renameat2
5
6glibc added it upstream:
7https://sourceware.org/git/?p=glibc.git;a=commit;h=d6da5cb6a8e0e8a9ce92b7d951a254cf325248d7
8
9But we need the right header.
10Ref: https://github.com/flatpak/flatpak/issues/1890
11---
12 libglnx.m4 | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/libglnx.m4 b/libglnx.m4
16index 43dff97..fd68717 100644
17--- a/libglnx.m4
18+++ b/libglnx.m4
19@@ -6,6 +6,7 @@ AC_CHECK_DECLS([
20 [], [], [[
21 #include <sys/types.h>
22 #include <unistd.h>
23+#include <stdio.h>
24 #include <sys/mount.h>
25 #include <fcntl.h>
26 #include <sched.h>
diff --git a/meta-boot2qt/recipes-core/ostree/ostree_git.bb b/meta-boot2qt/recipes-core/ostree/ostree_git.bb
index e4c8076..30b94b3 100644
--- a/meta-boot2qt/recipes-core/ostree/ostree_git.bb
+++ b/meta-boot2qt/recipes-core/ostree/ostree_git.bb
@@ -32,6 +32,9 @@ SUMMARY = "Shared library with a reference command line tool for managing bootab
32LICENSE = "LGPL-2.1" 32LICENSE = "LGPL-2.1"
33LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" 33LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
34 34
35SRC_URI[libglnx.md5sum] = "110edb31abcea2fbdacbe0b3adf7eee4"
36SRC_URI[libglnx.sha256sum] = "b2de841b0efe12803930f5e21fe46ef4f4c5180fb59576feb5902c944761d27a"
37
35inherit autotools pkgconfig systemd 38inherit autotools pkgconfig systemd
36 39
37SRC_URI = " \ 40SRC_URI = " \
@@ -47,12 +50,19 @@ SRC_URI = " \
47 file://Workaround-the-SIGCHLD-handler-issue.patch \ 50 file://Workaround-the-SIGCHLD-handler-issue.patch \
48 file://workaround-gtkdocize-configure-issue-in-autog.patch \ 51 file://workaround-gtkdocize-configure-issue-in-autog.patch \
49 " 52 "
53SRC_URI += " \
54 git://gitlab.gnome.org/GNOME/libglnx;name=libglnx;branch=master;protocol=https;destsuffix=git/libglnx \
55 file://0001-libglnx.m4-Include-stdio.h-for-renameat2.patch;patchdir=libglnx \
56 "
50 57
51SRCREV = "8ece4d6d51bdbe3e41ab318259276bb83e553aa0" 58SRCREV_ostree = "8ece4d6d51bdbe3e41ab318259276bb83e553aa0"
59SRCREV_libglnx = "4ae5e3beaaa674abfabf7404ab6fafcc4ec547db"
60SRCREV = "${SRCREV_ostree}"
52 61
53S = "${WORKDIR}/git" 62S = "${WORKDIR}/git"
54 63
55DEPENDS = "glib-2.0 glib-2.0-native e2fsprogs gpgme attr libsoup-2.4 libassuan xz systemd" 64DEPENDS = "glib-2.0 glib-2.0-native e2fsprogs gpgme attr libsoup-2.4 libassuan xz systemd bison-native"
65
56# Bash is needed by the shipped dracut module. This dracut module is used to generate initramfs image. 66# Bash is needed by the shipped dracut module. This dracut module is used to generate initramfs image.
57# The production image do not require bash for proper working. 67# The production image do not require bash for proper working.
58RDEPENDS_${PN} += "bash" 68RDEPENDS_${PN} += "bash"
diff --git a/meta-fsl-extras/conf/layer.conf b/meta-fsl-extras/conf/layer.conf
index 74e2652..4ddfd49 100644
--- a/meta-fsl-extras/conf/layer.conf
+++ b/meta-fsl-extras/conf/layer.conf
@@ -39,4 +39,4 @@ BBFILE_COLLECTIONS += "b2qt_fsl"
39BBFILE_PATTERN_b2qt_fsl := "^${LAYERDIR}/" 39BBFILE_PATTERN_b2qt_fsl := "^${LAYERDIR}/"
40BBFILE_PRIORITY_b2qt_fsl = "20" 40BBFILE_PRIORITY_b2qt_fsl = "20"
41 41
42LAYERSERIES_COMPAT_b2qt_fsl = "sumo" 42LAYERSERIES_COMPAT_b2qt_fsl = "thud"
diff --git a/meta-fsl-extras/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.0.bb b/meta-fsl-extras/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.0.bb
new file mode 100644
index 0000000..6d03807
--- /dev/null
+++ b/meta-fsl-extras/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.0.bb
@@ -0,0 +1,35 @@
1############################################################################
2##
3## Copyright (C) 2019 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
30require recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.2.bb
31
32FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/poky/meta/recipes-multimedia/gstreamer/${PN}:"
33
34SRC_URI[md5sum] = "943045b9e937ffc5c6cfa0bd5c44230d"
35SRC_URI[sha256sum] = "fb134b4d3e054746ef8b922ff157b0c7903d1fdd910708a45add66954da7ef89"
diff --git a/meta-fsl-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.0.bb b/meta-fsl-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.0.bb
new file mode 100644
index 0000000..aee9367
--- /dev/null
+++ b/meta-fsl-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.0.bb
@@ -0,0 +1,35 @@
1############################################################################
2##
3## Copyright (C) 2019 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
30require recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.2.bb
31
32FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/poky/meta/recipes-multimedia/gstreamer/files:"
33
34SRC_URI[md5sum] = "bcb1f8d9339176aee2b5da2a9cb2df88"
35SRC_URI[sha256sum] = "3fb9ea5fc8a2de4b3eaec4128d71c6a2d81dd19befe1cd87cb833b98bcb542d1"
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch
index 2e5382f..df1429b 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch
@@ -1,59 +1,63 @@
1From 1abe757120dd19518fd09d2013f518fba46c4d06 Mon Sep 17 00:00:00 2001 1From 74ffd57e80fd3f4e2d2d0b60e42a3b570aeb9c97 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Mon, 15 May 2017 15:31:36 +0300 3Date: Mon, 15 May 2017 15:31:36 +0300
4Subject: [PATCH] Make sdboot default on all boards 4Subject: [PATCH] Make sdboot default on all boards
5 5
6... and remove console=tty1 from kernel args 6... and remove console=tty1 from kernel args
7--- 7---
8 include/configs/apalis_imx6.h | 3 ++- 8 include/configs/apalis_imx6.h | 5 +++--
9 include/configs/colibri_imx6.h | 3 ++- 9 include/configs/colibri_imx6.h | 5 +++--
10 include/configs/colibri_imx7.h | 2 +- 10 include/configs/colibri_imx7.h | 2 +-
11 include/configs/colibri_vf.h | 2 +- 11 include/configs/colibri_vf.h | 2 +-
12 4 files changed, 6 insertions(+), 4 deletions(-) 12 4 files changed, 8 insertions(+), 6 deletions(-)
13 13
14diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h 14diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
15index 71dfeb56f5..8dcb5cc5e4 100644 15index fa40c629c3..ad0284de8a 100644
16--- a/include/configs/apalis_imx6.h 16--- a/include/configs/apalis_imx6.h
17+++ b/include/configs/apalis_imx6.h 17+++ b/include/configs/apalis_imx6.h
18@@ -256,7 +256,8 @@ 18@@ -177,8 +177,9 @@
19 #ifdef CONFIG_TDX_EASY_INSTALLER
20 #define CONFIG_BOOTCOMMAND "run distro_bootcmd"
21 #else
22-#define CONFIG_BOOTCOMMAND "run emmcboot; echo; echo emmcboot failed; " \
23- "run distro_bootcmd; usb start; " \
24+#define CONFIG_BOOTCOMMAND "run sdboot; echo; echo sdboot failed; " \
25+ "run emmcboot; echo; echo emmcboot failed; " \
26+ "run distro_bootcmd; usb start; " \
27 "setenv stdout serial,vga; setenv stdin serial,usbkbd"
19 #endif 28 #endif
20 #define CONFIG_EXTRA_ENV_SETTINGS \ 29
21 BOOTENV \
22- "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \
23+ "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \
24+ "run emmcboot ; echo ; echo emmcboot failed ; " \
25 "run distro_bootcmd ; " \
26 "usb start ;" \
27 "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
28diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h 30diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
29index f1fd5b422e..ae0f3c9bfa 100644 31index fda171bd9e..df49efc9ef 100644
30--- a/include/configs/colibri_imx6.h 32--- a/include/configs/colibri_imx6.h
31+++ b/include/configs/colibri_imx6.h 33+++ b/include/configs/colibri_imx6.h
32@@ -231,7 +231,8 @@ 34@@ -157,8 +157,9 @@
33 #define FDT_FILE "imx6dl-colibri-eval-v3.dtb" 35 #ifdef CONFIG_TDX_EASY_INSTALLER
34 #define CONFIG_EXTRA_ENV_SETTINGS \ 36 #define CONFIG_BOOTCOMMAND "run distro_bootcmd"
35 BOOTENV \ 37 #else
36- "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ 38-#define CONFIG_BOOTCOMMAND "run emmcboot; echo; echo emmcboot failed; " \
37+ "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \ 39- "run distro_bootcmd; usb start; " \
38+ "run emmcboot ; echo ; echo emmcboot failed ; " \ 40+#define CONFIG_BOOTCOMMAND "run sdboot; echo; echo sdboot failed; " \
39 "run distro_bootcmd ; " \ 41+ "run emmcboot ; echo ; echo emmcboot failed ; " \
40 "usb start ;" \ 42+ "run distro_bootcmd; usb start; " \
41 "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ 43 "setenv stdout serial,vga; setenv stdin serial,usbkbd"
44 #endif
45
42diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h 46diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
43index ea04762b49..47e8bd266d 100644 47index 6c91951878..4200512fea 100644
44--- a/include/configs/colibri_imx7.h 48--- a/include/configs/colibri_imx7.h
45+++ b/include/configs/colibri_imx7.h 49+++ b/include/configs/colibri_imx7.h
46@@ -104,7 +104,7 @@ 50@@ -128,7 +128,7 @@
47 "ubi read ${fdt_addr_r} dtb && " \ 51 #define CONFIG_BOOTCOMMAND "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && " \
48 "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ 52 "run bootcmd_mmc0; run ubiboot; run distro_bootcmd"
49 53 #else
50-#define CONFIG_BOOTCOMMAND "run ubiboot; " \ 54-#define CONFIG_BOOTCOMMAND "run ubiboot; " \
51+#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; " \ 55+#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; " \
52 "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd;" 56 "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd"
57 #endif
53 58
54 #define BOOTENV_RUN_NET_USB_START ""
55diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h 59diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
56index db610d53f1..a2c942cafe 100644 60index 0579bfdc4e..65a5dada5f 100644
57--- a/include/configs/colibri_vf.h 61--- a/include/configs/colibri_vf.h
58+++ b/include/configs/colibri_vf.h 62+++ b/include/configs/colibri_vf.h
59@@ -155,7 +155,7 @@ 63@@ -155,7 +155,7 @@
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0003-apalis-imx6-Ixora-v1.0-support.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0003-apalis-imx6-Ixora-v1.0-support.patch
index d2e82a7..8d28abe 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0003-apalis-imx6-Ixora-v1.0-support.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0003-apalis-imx6-Ixora-v1.0-support.patch
@@ -1,4 +1,4 @@
1From ccbaab75abc8d5f5cbadc6a0285dd496a45252cf Mon Sep 17 00:00:00 2001 1From 166dae45bcfcd92cd2802db785a30072f65c0900 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Thu, 12 Oct 2017 11:02:54 +0300 3Date: Thu, 12 Oct 2017 11:02:54 +0300
4Subject: [PATCH] apalis-imx6: Ixora v1.0 support 4Subject: [PATCH] apalis-imx6: Ixora v1.0 support
@@ -7,29 +7,27 @@ Add sddrive variable that can be changed to boot from different mmc card
7slot when using different versions of ixora carrier board. 7slot when using different versions of ixora carrier board.
8Default to drive 1, which is correct for Ixora v1.1. 8Default to drive 1, which is correct for Ixora v1.1.
9--- 9---
10 include/configs/apalis_imx6.h | 9 +++++---- 10 include/configs/apalis_imx6.h | 10 ++++++----
11 1 file changed, 5 insertions(+), 4 deletions(-) 11 1 file changed, 6 insertions(+), 4 deletions(-)
12 12
13diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h 13diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
14index 3351a18e4c..7aabb1334b 100644 14index 3f224e54b8..9e1b5a0f75 100644
15--- a/include/configs/apalis_imx6.h 15--- a/include/configs/apalis_imx6.h
16+++ b/include/configs/apalis_imx6.h 16+++ b/include/configs/apalis_imx6.h
17@@ -226,15 +226,16 @@ 17@@ -238,12 +238,14 @@
18 "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" 18 "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
19 19
20 #define SD_BOOTCMD \ 20 #define SD_BOOTCMD \
21- "sdargs=ip=off root=/dev/mmcblk1p2 ro rootfstype=ext4 " \ 21- "sdargs=ip=off root=/dev/mmcblk1p2 ro rootfstype=ext4 rootwait\0" \
22+ "sddrive=1\0" \ 22- "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
23+ "sdsetup=setenv sdargs ip=off root=/dev/mmcblk${sddrive}p2 ro rootfstype=ext4 " \ 23+ "sddrive=1\0" \
24 "rootwait\0" \ 24+ "sdsetup=setenv sdargs ip=off root=/dev/mmcblk${sddrive}p2 ro rootfstype=ext4 rootwait\0" \
25- "sdboot=run setup; " \ 25+ "sdboot=run setup; run sdsetup; " \
26+ "sdboot=run setup; run sdsetup; " \ 26+ "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
27 "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ 27 "${vidargs}; echo Booting from MMC/SD card in 8-bit slot...; " \
28 "${vidargs}; echo Booting from SD card; " \ 28- "run sddtbload; load mmc 1:1 ${kernel_addr_r} ${boot_file} " \
29- "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \ 29+ "run sddtbload; load mmc ${sddrive}:1 ${kernel_addr_r} ${boot_file} " \
30+ "run sddtbload; load mmc ${sddrive}:1 ${kernel_addr_r} " \ 30 "&& run fdt_fixup && bootz ${kernel_addr_r} ${dtbparam}\0" \
31 "${boot_file} && run fdt_fixup && " \
32 "bootz ${kernel_addr_r} ${dtbparam}\0" \
33- "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \ 31- "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \
34+ "sddtbload=setenv dtbparam; load mmc ${sddrive}:1 ${fdt_addr_r} " \ 32+ "sddtbload=setenv dtbparam; load mmc ${sddrive}:1 ${fdt_addr_r} " \
35 "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" 33 "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
diff --git a/meta-intel-extras/conf/layer.conf b/meta-intel-extras/conf/layer.conf
index ef83d53..038539f 100644
--- a/meta-intel-extras/conf/layer.conf
+++ b/meta-intel-extras/conf/layer.conf
@@ -39,4 +39,4 @@ BBFILE_COLLECTIONS += "b2qt_intel"
39BBFILE_PATTERN_b2qt_intel := "^${LAYERDIR}/" 39BBFILE_PATTERN_b2qt_intel := "^${LAYERDIR}/"
40BBFILE_PRIORITY_b2qt_intel = "20" 40BBFILE_PRIORITY_b2qt_intel = "20"
41 41
42LAYERSERIES_COMPAT_b2qt_intel = "sumo" 42LAYERSERIES_COMPAT_b2qt_intel = "thud"
diff --git a/meta-raspberrypi-extras/conf/layer.conf b/meta-raspberrypi-extras/conf/layer.conf
index 0e85afe..6b2e55a 100644
--- a/meta-raspberrypi-extras/conf/layer.conf
+++ b/meta-raspberrypi-extras/conf/layer.conf
@@ -39,4 +39,4 @@ BBFILE_COLLECTIONS += "b2qt_rpi"
39BBFILE_PATTERN_b2qt_rpi := "^${LAYERDIR}/" 39BBFILE_PATTERN_b2qt_rpi := "^${LAYERDIR}/"
40BBFILE_PRIORITY_b2qt_rpi = "20" 40BBFILE_PRIORITY_b2qt_rpi = "20"
41 41
42LAYERSERIES_COMPAT_b2qt_rpi = "sumo" 42LAYERSERIES_COMPAT_b2qt_rpi = "thud"
diff --git a/meta-raspberrypi-extras/recipes/userland/userland/0001-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch b/meta-raspberrypi-extras/recipes/userland/userland/0001-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch
deleted file mode 100644
index d21fd09..0000000
--- a/meta-raspberrypi-extras/recipes/userland/userland/0001-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From e977e56df364e3a89e08bd7b8a27d30360b0ccc7 Mon Sep 17 00:00:00 2001
2From: Hugo Hromic <hhromic@gmail.com>
3Date: Sun, 13 May 2018 10:49:04 +0100
4Subject: [PATCH] khronos: backport typedef for EGL_EXT_image_dma_buf_import
5
6The `gstreamer1.0-plugins-base` package version `1.14` uses `EGL_EXT_image_dma_buf_import`, which
7expects the `EGLuint64KHR` typedef that is present in recent versions of Khronos.
8However, the older version included in userland does not provide it.
9
10This patch backports the missing typedef from recent Khronos into userland.
11See: <https://www.khronos.org/registry/EGL/api/EGL/eglext.h>
12
13Submitted to userland in <https://github.com/raspberrypi/userland/pull/467>
14
15Upstream-Status: Submitted
16---
17 interface/khronos/include/EGL/eglext.h | 4 ++++
18 1 file changed, 4 insertions(+)
19
20diff --git a/interface/khronos/include/EGL/eglext.h b/interface/khronos/include/EGL/eglext.h
21index 89a3369..87cf7d2 100755
22--- a/interface/khronos/include/EGL/eglext.h
23+++ b/interface/khronos/include/EGL/eglext.h
24@@ -190,6 +190,10 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLSIGNALSYNCKHRPROC) (EGLDisplay dpy, EGLSy
25 typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLint attribute, EGLint *value);
26 #endif
27
28+#ifndef EGL_KHR_uint64_typedef
29+#define EGL_KHR_uint64_typedef 1
30+typedef khronos_uint64_t EGLuint64KHR;
31+#endif /* EGL_KHR_uint64_typedef */
32
33 #ifdef __cplusplus
34 }
diff --git a/meta-tegra-extras/conf/layer.conf b/meta-tegra-extras/conf/layer.conf
index f5b4906..190f188 100644
--- a/meta-tegra-extras/conf/layer.conf
+++ b/meta-tegra-extras/conf/layer.conf
@@ -39,4 +39,4 @@ BBFILE_COLLECTIONS += "b2qt_tegra"
39BBFILE_PATTERN_b2qt_tegra := "^${LAYERDIR}/" 39BBFILE_PATTERN_b2qt_tegra := "^${LAYERDIR}/"
40BBFILE_PRIORITY_b2qt_tegra = "20" 40BBFILE_PRIORITY_b2qt_tegra = "20"
41 41
42LAYERSERIES_COMPAT_b2qt_tegra = "sumo" 42LAYERSERIES_COMPAT_b2qt_tegra = "thud"
diff --git a/meta-toradex-extras/conf/layer.conf b/meta-toradex-extras/conf/layer.conf
index 3a43fd7..ef241be 100644
--- a/meta-toradex-extras/conf/layer.conf
+++ b/meta-toradex-extras/conf/layer.conf
@@ -39,8 +39,8 @@ BBFILE_COLLECTIONS += "b2qt_toradex"
39BBFILE_PATTERN_b2qt_toradex := "^${LAYERDIR}/" 39BBFILE_PATTERN_b2qt_toradex := "^${LAYERDIR}/"
40BBFILE_PRIORITY_b2qt_toradex = "20" 40BBFILE_PRIORITY_b2qt_toradex = "20"
41 41
42LAYERSERIES_COMPAT_b2qt_toradex = "sumo" 42LAYERSERIES_COMPAT_b2qt_toradex = "thud"
43 43
44# override toradex layer COMPATs 44# override toradex layer COMPATs
45LAYERSERIES_COMPAT_toradex-bsp-common-layer = "sumo" 45LAYERSERIES_COMPAT_toradex-bsp-common-layer = "thud"
46LAYERSERIES_COMPAT_toradex-nxp-layer = "sumo" 46LAYERSERIES_COMPAT_toradex-nxp-layer = "thud"
diff --git a/meta-toradex-extras/recipes/systemd/systemd/0001-systemd-udevd.service.in-set-MountFlags-shared.patch b/meta-toradex-extras/recipes/systemd/systemd/0001-systemd-udevd.service.in-set-MountFlags-shared.patch
new file mode 100644
index 0000000..ef7e541
--- /dev/null
+++ b/meta-toradex-extras/recipes/systemd/systemd/0001-systemd-udevd.service.in-set-MountFlags-shared.patch
@@ -0,0 +1,22 @@
1From 2a9d175360f1ed3ef85e336a329a9e803226096e Mon Sep 17 00:00:00 2001
2From: Max Krummenacher <max.oss.09@gmail.com>
3Date: Thu, 29 Oct 2015 19:38:50 +0100
4Subject: [PATCH] systemd-udevd.service.in: set MountFlags=shared
5
6This allows for udevd automounting of drives accessible to all.
7---
8 units/systemd-udevd.service.in | 1 -
9 1 file changed, 1 deletion(-)
10
11diff --git a/units/systemd-udevd.service.in b/units/systemd-udevd.service.in
12index 6a3814e5d9..e3f3ad3293 100644
13--- a/units/systemd-udevd.service.in
14+++ b/units/systemd-udevd.service.in
15@@ -25,7 +25,6 @@ ExecStart=@rootlibexecdir@/systemd-udevd
16 KillMode=mixed
17 WatchdogSec=3min
18 TasksMax=infinity
19-PrivateMounts=yes
20 MemoryDenyWriteExecute=yes
21 RestrictRealtime=yes
22 RestrictAddressFamilies=AF_UNIX AF_NETLINK AF_INET AF_INET6
diff --git a/meta-raspberrypi-extras/recipes/userland/userland_git.bbappend b/meta-toradex-extras/recipes/systemd/systemd_%.bbappend
index dc421e5..52e23dc 100644
--- a/meta-raspberrypi-extras/recipes/userland/userland_git.bbappend
+++ b/meta-toradex-extras/recipes/systemd/systemd_%.bbappend
@@ -1,6 +1,6 @@
1############################################################################ 1############################################################################
2## 2##
3## Copyright (C) 2018 The Qt Company Ltd. 3## Copyright (C) 2019 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/ 4## Contact: https://www.qt.io/licensing/
5## 5##
6## This file is part of the Boot to Qt meta layer. 6## This file is part of the Boot to Qt meta layer.
@@ -28,8 +28,6 @@
28############################################################################ 28############################################################################
29 29
30FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 30FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
31 31SRC_URI += " \
32SRC_URI += "file://0001-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch" 32 file://0001-systemd-udevd.service.in-set-MountFlags-shared.patch \
33 33"
34SRCREV = "2448644657e5fbfd82299416d218396ee1115ece"
35PV = "20180511"
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 032e9ad..012402d 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -18,11 +18,11 @@
18 18
19 <project name="poky" 19 <project name="poky"
20 remote="yocto" 20 remote="yocto"
21 revision="623b77885051174d0e05198843e739110977bd18" 21 revision="84eecb017ef92ef36b4df730908828e54aeff85c"
22 path="sources/poky"/> 22 path="sources/poky"/>
23 <project name="meta-openembedded" 23 <project name="meta-openembedded"
24 remote="oe-mirror" 24 remote="oe-mirror"
25 revision="8760facba1bceb299b3613b8955621ddaa3d4c3f" 25 revision="6094ae18c8a35e5cc9998ac39869390d7f3bb1e2"
26 path="sources/meta-openembedded"/> 26 path="sources/meta-openembedded"/>
27 <project name="meta-qt5" 27 <project name="meta-qt5"
28 remote="qtyocto" 28 remote="qtyocto"
@@ -35,17 +35,17 @@
35 35
36 <project name="meta-freescale" 36 <project name="meta-freescale"
37 remote="freescale" 37 remote="freescale"
38 revision="407c6cf408969445031a492e2d25e0e2749582ea" 38 revision="9d1463c9af81edadf8c5a343a030555b6156f8cf"
39 path="sources/meta-freescale" 39 path="sources/meta-freescale"
40 groups="notdefault,external,fsl,toradex,smx6,boundary,fsl-imx8"/> 40 groups="notdefault,external,fsl,toradex,smx6,boundary,fsl-imx8"/>
41 <project name="meta-freescale-3rdparty" 41 <project name="meta-freescale-3rdparty"
42 remote="freescale" 42 remote="freescale"
43 revision="88a29631809d1af0df618245430db29f2a7012b5" 43 revision="47848bff9478999019947f69a719b3d2c2a6b558"
44 path="sources/meta-freescale-3rdparty" 44 path="sources/meta-freescale-3rdparty"
45 groups="notdefault,external,fsl,toradex,smx6,boundary,fsl-imx8"/> 45 groups="notdefault,external,fsl,toradex,smx6,boundary,fsl-imx8"/>
46 <project name="meta-raspberrypi" 46 <project name="meta-raspberrypi"
47 remote="yocto" 47 remote="yocto"
48 revision="2d40b000021bc8a9ef7f329ed0ad410f8d227b97" 48 revision="a48743dc36e31170cf737e200cc88f273e13611a"
49 path="sources/meta-raspberrypi" 49 path="sources/meta-raspberrypi"
50 groups="notdefault,external,rpi"/> 50 groups="notdefault,external,rpi"/>
51 <project name="meta-intel" 51 <project name="meta-intel"
@@ -55,7 +55,7 @@
55 groups="notdefault,external,intel"/> 55 groups="notdefault,external,intel"/>
56 <project name="meta-tegra" 56 <project name="meta-tegra"
57 remote="madisongh" 57 remote="madisongh"
58 revision="6b6942c8dd15c2b4a460d46e803b962663955fde" 58 revision="da90b42297f5d14d362015be1c5a888f5cac946a"
59 path="sources/meta-tegra" 59 path="sources/meta-tegra"
60 groups="notdefault,external,jetson"/> 60 groups="notdefault,external,jetson"/>
61 <project name="meta-renesas" 61 <project name="meta-renesas"
@@ -75,12 +75,12 @@
75 groups="notdefault,external,renesas-gen3,renesas-draak"/> 75 groups="notdefault,external,renesas-gen3,renesas-draak"/>
76 <project name="meta-toradex-bsp-common" 76 <project name="meta-toradex-bsp-common"
77 remote="toradex" 77 remote="toradex"
78 revision="3e713eef6e056c955b82adaf4b45286a98c3fcdf" 78 revision="b3fe56eec075ccd719b0ec1fde32ad9c37f0cca0"
79 path="sources/meta-toradex-bsp-common" 79 path="sources/meta-toradex-bsp-common"
80 groups="notdefault,external,toradex"/> 80 groups="notdefault,external,toradex"/>
81 <project name="meta-toradex-nxp" 81 <project name="meta-toradex-nxp"
82 remote="toradex" 82 remote="toradex"
83 revision="656677f4a68e6747971a4a30550cd72c3beb6a76" 83 revision="53d4be5b9b8f609ae713e6eea8e935a73f7f7fd6"
84 path="sources/meta-toradex-nxp" 84 path="sources/meta-toradex-nxp"
85 groups="notdefault,external,toradex"/> 85 groups="notdefault,external,toradex"/>
86 <project name="meta-boundary" 86 <project name="meta-boundary"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-12 21:42:12 +0000