yocto: upgrade to yocto 2.6 (thud)

Initial upgrade commit from yocto 2.5.2 (sumo) -> 2.6 (thud).
System & some group 1 devices related meta layers, appends & patches updated:

* poky, meta-openembedded & meta-mingw updated to thud branch
  - layer.conf files updated to support thud where applicable
  - obsolete gstreamer-plugins-bad BBMASK + bbappend overide removed
  - ostree build issues fixed with upstream submodule patch

* meta-freescale & meta-freescale-3rdparty updated to thud branch

* meta-toradex-bsp-common & meta-toradex-nxp update to latest tagged release (2.8b5) in toradex/rocko branch
  - to fix build issue a systemd patch taken from meta-toradex-bsp-common toradex/master-next branch (thud compatible)
  - mask gstreamer recipes from toradex layer and use older versions for
    libav and plugins-ugly, so that they match the imx version of gstreamer.

* meta-raspberry update to latest in master branch (where thud layer compatibility is set)

* meta-tegra update to latest in thud branch
 - vulkan disabled from jetsons since NVIDIA's Vulkan support is for X only

Task-number: QTBUG-72413
Change-Id: Ida277b66840babc23e877161a26f1ae1b3c68fda
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>

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 \
                    115200;ttymxc1"
 
 KERNEL_MODULE_AUTOLOAD += "atmel_mxt_ts"
-
-PREFERRED_VERSION_imx-gpu-viv = "6.2.4.p1.2-aarch32"
-PREFERRED_VERSION_imx-gpu-g2d = "6.2.4.p1.2"
-PREFERRED_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 += " \
     SPL-${MACHINE}-spl;${MACHINEDIR}/SPL \
     "
 
-PREFERRED_VERSION_imx-gpu-viv = "6.2.4.p1.2-aarch32"
-PREFERRED_VERSION_imx-gpu-g2d = "6.2.4.p1.2"
-PREFERRED_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 @@
 ############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -41,3 +41,6 @@ QBSP_IMAGE_CONTENT = "\
     ${IMAGE_LINK_NAME}.conf \
     ${IMAGE_LINK_NAME}.flasher.tar.gz \
     "
+
+# NVIDIA's Vulkan support is for X only
+DISTRO_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 @@
 ############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -34,8 +34,10 @@ require conf/machine/include/${MACHINE}.inc
 
 BBMASK += "\
    meta-toradex-nxp/recipes-graphics/xorg-xserver \
+   meta-toradex-nxp/recipes-multimedia/gstreamer \
    meta-toradex-bsp-common/recipes-devtools/python \
    meta-toradex-bsp-common/recipes-devtools/e2fsprogs \
+   meta-toradex-bsp-common/recipes-core/systemd \
    "
 
 PREFERRED_PROVIDER_u-boot = "u-boot-toradex"
@@ -49,3 +51,7 @@ IMAGE_BOOT_FILES += " \
     fwd_mmc.img;flash_mmc.img \
     ${MACHINE}/*;${MACHINEDIR}/ \
     "
+
+# use 1.14.0 that matches the imx version of gstreamer
+PREFERRED_VERSION_gstreamer1.0-plugins-ugly = "1.14.0"
+PREFERRED_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}"
 BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
             ${LAYERDIR}/recipes*/*/*.bbappend \
             "
-BBMASK += "meta-qt5/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_%.bbappend"
 
 BBFILE_COLLECTIONS += "b2qt-distro"
 BBFILE_PATTERN_b2qt-distro := "^${LAYERDIR}/"
 BBFILE_PRIORITY_b2qt-distro = "20"
 
-LAYERSERIES_COMPAT_b2qt-distro = "sumo"
+LAYERSERIES_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 @@
 ############################################################################
 
 PACKAGECONFIG_append = " faad"
-
-inherit qmake5_paths
-
-PACKAGECONFIG[qt5] = '--enable-qt \
-                      --with-moc="${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc" \
-                      --with-uic="${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/uic" \
-                      --with-rcc="${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/rcc" \
-                     ,--disable-qt,qtbase qtdeclarative qtbase-native'
-
-# The GStreamer Qt5 plugin needs desktop OpenGL or OpenGL ES to work, so make sure it is enabled
-python() {
-    cur_packageconfig = d.getVar('PACKAGECONFIG',True).split()
-    if 'qt5' in cur_packageconfig and not (('opengl' in cur_packageconfig) or ('gles2' in cur_packageconfig)):
-        gl_packageconfig = d.getVar('PACKAGECONFIG_GL',True)
-        d.appendVar('PACKAGECONFIG', ' ' + gl_packageconfig)
-}
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}"
 
 HOSTTOOLS += "git-lfs"
 
-LAYERSERIES_COMPAT_b2qt = "sumo"
+LAYERSERIES_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 @@
+From aa04ed9af553b979b19ef31a9ea2241789a15a60 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Wed, 11 Jul 2018 14:56:32 -0400
+Subject: [PATCH] libglnx.m4: Include stdio.h for renameat2
+
+glibc added it upstream:
+https://sourceware.org/git/?p=glibc.git;a=commit;h=d6da5cb6a8e0e8a9ce92b7d951a254cf325248d7
+
+But we need the right header.
+Ref: https://github.com/flatpak/flatpak/issues/1890
+---
+ libglnx.m4 | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libglnx.m4 b/libglnx.m4
+index 43dff97..fd68717 100644
+--- a/libglnx.m4
++++ b/libglnx.m4
+@@ -6,6 +6,7 @@ AC_CHECK_DECLS([
+         [], [], [[
+ #include <sys/types.h>
+ #include <unistd.h>
++#include <stdio.h>
+ #include <sys/mount.h>
+ #include <fcntl.h>
+ #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
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
 
+SRC_URI[libglnx.md5sum] = "110edb31abcea2fbdacbe0b3adf7eee4"
+SRC_URI[libglnx.sha256sum] = "b2de841b0efe12803930f5e21fe46ef4f4c5180fb59576feb5902c944761d27a"
+
 inherit autotools pkgconfig systemd
 
 SRC_URI = " \
@@ -47,12 +50,19 @@ SRC_URI = " \
     file://Workaround-the-SIGCHLD-handler-issue.patch \
     file://workaround-gtkdocize-configure-issue-in-autog.patch \
     "
+SRC_URI += " \
+    git://gitlab.gnome.org/GNOME/libglnx;name=libglnx;branch=master;protocol=https;destsuffix=git/libglnx \
+    file://0001-libglnx.m4-Include-stdio.h-for-renameat2.patch;patchdir=libglnx \
+    "
 
-SRCREV = "8ece4d6d51bdbe3e41ab318259276bb83e553aa0"
+SRCREV_ostree = "8ece4d6d51bdbe3e41ab318259276bb83e553aa0"
+SRCREV_libglnx = "4ae5e3beaaa674abfabf7404ab6fafcc4ec547db"
+SRCREV = "${SRCREV_ostree}"
 
 S = "${WORKDIR}/git"
 
-DEPENDS = "glib-2.0 glib-2.0-native e2fsprogs gpgme attr libsoup-2.4 libassuan xz systemd"
+DEPENDS = "glib-2.0 glib-2.0-native e2fsprogs gpgme attr libsoup-2.4 libassuan xz systemd bison-native"
+
 # Bash is needed by the shipped dracut module. This dracut module is used to generate initramfs image.
 # The production image do not require bash for proper working.
 RDEPENDS_${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"
 BBFILE_PATTERN_b2qt_fsl := "^${LAYERDIR}/"
 BBFILE_PRIORITY_b2qt_fsl = "20"
 
-LAYERSERIES_COMPAT_b2qt_fsl = "sumo"
+LAYERSERIES_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 @@
+############################################################################
+##
+## Copyright (C) 2019 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+require recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.2.bb
+
+FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/poky/meta/recipes-multimedia/gstreamer/${PN}:"
+
+SRC_URI[md5sum] = "943045b9e937ffc5c6cfa0bd5c44230d"
+SRC_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 @@
+############################################################################
+##
+## Copyright (C) 2019 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+require recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.2.bb
+
+FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/poky/meta/recipes-multimedia/gstreamer/files:"
+
+SRC_URI[md5sum] = "bcb1f8d9339176aee2b5da2a9cb2df88"
+SRC_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 @@
-From 1abe757120dd19518fd09d2013f518fba46c4d06 Mon Sep 17 00:00:00 2001
+From 74ffd57e80fd3f4e2d2d0b60e42a3b570aeb9c97 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Mon, 15 May 2017 15:31:36 +0300
 Subject: [PATCH] Make sdboot default on all boards
 
 ... and remove console=tty1 from kernel args
 ---
- include/configs/apalis_imx6.h  | 3 ++-
- include/configs/colibri_imx6.h | 3 ++-
+ include/configs/apalis_imx6.h  | 5 +++--
+ include/configs/colibri_imx6.h | 5 +++--
  include/configs/colibri_imx7.h | 2 +-
  include/configs/colibri_vf.h   | 2 +-
- 4 files changed, 6 insertions(+), 4 deletions(-)
+ 4 files changed, 8 insertions(+), 6 deletions(-)
 
 diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
-index 71dfeb56f5..8dcb5cc5e4 100644
+index fa40c629c3..ad0284de8a 100644
 --- a/include/configs/apalis_imx6.h
 +++ b/include/configs/apalis_imx6.h
-@@ -256,7 +256,8 @@
+@@ -177,8 +177,9 @@
+ #ifdef CONFIG_TDX_EASY_INSTALLER
+ #define CONFIG_BOOTCOMMAND "run distro_bootcmd"
+ #else
+-#define CONFIG_BOOTCOMMAND "run emmcboot; echo; echo emmcboot failed; " \
+-               "run distro_bootcmd; usb start; " \
++#define CONFIG_BOOTCOMMAND "run sdboot; echo; echo sdboot failed; " \
++               "run emmcboot; echo; echo emmcboot failed; " \
++                "run distro_bootcmd; usb start; " \
+                "setenv stdout serial,vga; setenv stdin serial,usbkbd"
  #endif
- #define CONFIG_EXTRA_ENV_SETTINGS \
-        BOOTENV \
--       "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \
-+       "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \
-+        "run emmcboot ; echo ; echo emmcboot failed ; " \
-                "run distro_bootcmd ; " \
-                "usb start ;" \
-                "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
+ 
 diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
-index f1fd5b422e..ae0f3c9bfa 100644
+index fda171bd9e..df49efc9ef 100644
 --- a/include/configs/colibri_imx6.h
 +++ b/include/configs/colibri_imx6.h
-@@ -231,7 +231,8 @@
- #define FDT_FILE "imx6dl-colibri-eval-v3.dtb"
- #define CONFIG_EXTRA_ENV_SETTINGS \
-        BOOTENV \
--       "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \
-+       "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \
-+        "run emmcboot ; echo ; echo emmcboot failed ; " \
-                "run distro_bootcmd ; " \
-                "usb start ;" \
-                "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
+@@ -157,8 +157,9 @@
+ #ifdef CONFIG_TDX_EASY_INSTALLER
+ #define CONFIG_BOOTCOMMAND "run distro_bootcmd"
+ #else
+-#define CONFIG_BOOTCOMMAND "run emmcboot; echo; echo emmcboot failed; " \
+-               "run distro_bootcmd; usb start; " \
++#define CONFIG_BOOTCOMMAND "run sdboot; echo; echo sdboot failed; " \
++                "run emmcboot ; echo ; echo emmcboot failed ; " \
++                "run distro_bootcmd; usb start; " \
+                "setenv stdout serial,vga; setenv stdin serial,usbkbd"
+ #endif
+ 
 diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
-index ea04762b49..47e8bd266d 100644
+index 6c91951878..4200512fea 100644
 --- a/include/configs/colibri_imx7.h
 +++ b/include/configs/colibri_imx7.h
-@@ -104,7 +104,7 @@
-                "ubi read ${fdt_addr_r} dtb && " \
-                "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
- 
+@@ -128,7 +128,7 @@
+ #define CONFIG_BOOTCOMMAND "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && " \
+        "run bootcmd_mmc0; run ubiboot; run distro_bootcmd"
+ #else
 -#define CONFIG_BOOTCOMMAND "run ubiboot; " \
 +#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; " \
-        "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd;"
+        "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd"
+ #endif
  
- #define BOOTENV_RUN_NET_USB_START ""
 diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
-index db610d53f1..a2c942cafe 100644
+index 0579bfdc4e..65a5dada5f 100644
 --- a/include/configs/colibri_vf.h
 +++ b/include/configs/colibri_vf.h
 @@ -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 @@
-From ccbaab75abc8d5f5cbadc6a0285dd496a45252cf Mon Sep 17 00:00:00 2001
+From 166dae45bcfcd92cd2802db785a30072f65c0900 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Thu, 12 Oct 2017 11:02:54 +0300
 Subject: [PATCH] apalis-imx6: Ixora v1.0 support
@@ -7,29 +7,27 @@ Add sddrive variable that can be changed to boot from different mmc card
 slot when using different versions of ixora carrier board.
 Default to drive 1, which is correct for Ixora v1.1.
 ---
- include/configs/apalis_imx6.h | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
+ include/configs/apalis_imx6.h | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
 
 diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
-index 3351a18e4c..7aabb1334b 100644
+index 3f224e54b8..9e1b5a0f75 100644
 --- a/include/configs/apalis_imx6.h
 +++ b/include/configs/apalis_imx6.h
-@@ -226,15 +226,16 @@
+@@ -238,12 +238,14 @@
                 "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
  
  #define SD_BOOTCMD \
--       "sdargs=ip=off root=/dev/mmcblk1p2 ro rootfstype=ext4 " \
-+       "sddrive=1\0" \
-+       "sdsetup=setenv sdargs ip=off root=/dev/mmcblk${sddrive}p2 ro rootfstype=ext4 " \
-                "rootwait\0" \
--       "sdboot=run setup; " \
-+       "sdboot=run setup; run sdsetup; " \
-                "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
-                "${vidargs}; echo Booting from SD card; " \
--               "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \
-+               "run sddtbload; load mmc ${sddrive}:1 ${kernel_addr_r} " \
-                "${boot_file} && run fdt_fixup && " \
-                "bootz ${kernel_addr_r} ${dtbparam}\0" \
+-       "sdargs=ip=off root=/dev/mmcblk1p2 ro rootfstype=ext4 rootwait\0" \
+-       "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
++        "sddrive=1\0" \
++        "sdsetup=setenv sdargs ip=off root=/dev/mmcblk${sddrive}p2 ro rootfstype=ext4 rootwait\0" \
++        "sdboot=run setup; run sdsetup; " \
++                "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
+                "${vidargs}; echo Booting from MMC/SD card in 8-bit slot...; " \
+-               "run sddtbload; load mmc 1:1 ${kernel_addr_r} ${boot_file} " \
++               "run sddtbload; load mmc ${sddrive}:1 ${kernel_addr_r} ${boot_file} " \
+                "&& run fdt_fixup && bootz ${kernel_addr_r} ${dtbparam}\0" \
 -       "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \
 +       "sddtbload=setenv dtbparam; load mmc ${sddrive}:1 ${fdt_addr_r} " \
                 "${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"
 BBFILE_PATTERN_b2qt_intel := "^${LAYERDIR}/"
 BBFILE_PRIORITY_b2qt_intel = "20"
 
-LAYERSERIES_COMPAT_b2qt_intel = "sumo"
+LAYERSERIES_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"
 BBFILE_PATTERN_b2qt_rpi := "^${LAYERDIR}/"
 BBFILE_PRIORITY_b2qt_rpi = "20"
 
-LAYERSERIES_COMPAT_b2qt_rpi = "sumo"
+LAYERSERIES_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 @@
-From e977e56df364e3a89e08bd7b8a27d30360b0ccc7 Mon Sep 17 00:00:00 2001
-From: Hugo Hromic <hhromic@gmail.com>
-Date: Sun, 13 May 2018 10:49:04 +0100
-Subject: [PATCH] khronos: backport typedef for EGL_EXT_image_dma_buf_import
-
-The `gstreamer1.0-plugins-base` package version `1.14` uses `EGL_EXT_image_dma_buf_import`, which
-expects the `EGLuint64KHR` typedef that is present in recent versions of Khronos.
-However, the older version included in userland does not provide it.
-
-This patch backports the missing typedef from recent Khronos into userland.
-See: <https://www.khronos.org/registry/EGL/api/EGL/eglext.h>
-
-Submitted to userland in <https://github.com/raspberrypi/userland/pull/467>
-
-Upstream-Status: Submitted
----
- interface/khronos/include/EGL/eglext.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/interface/khronos/include/EGL/eglext.h b/interface/khronos/include/EGL/eglext.h
-index 89a3369..87cf7d2 100755
---- a/interface/khronos/include/EGL/eglext.h
-+++ b/interface/khronos/include/EGL/eglext.h
-@@ -190,6 +190,10 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLSIGNALSYNCKHRPROC) (EGLDisplay dpy, EGLSy
- typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLint attribute, EGLint *value);
- #endif
- 
-+#ifndef EGL_KHR_uint64_typedef
-+#define EGL_KHR_uint64_typedef 1
-+typedef khronos_uint64_t EGLuint64KHR;
-+#endif /* EGL_KHR_uint64_typedef */
- 
- #ifdef __cplusplus
- }
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"
 BBFILE_PATTERN_b2qt_tegra := "^${LAYERDIR}/"
 BBFILE_PRIORITY_b2qt_tegra = "20"
 
-LAYERSERIES_COMPAT_b2qt_tegra = "sumo"
+LAYERSERIES_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"
 BBFILE_PATTERN_b2qt_toradex := "^${LAYERDIR}/"
 BBFILE_PRIORITY_b2qt_toradex = "20"
 
-LAYERSERIES_COMPAT_b2qt_toradex = "sumo"
+LAYERSERIES_COMPAT_b2qt_toradex = "thud"
 
 # override toradex layer COMPATs
-LAYERSERIES_COMPAT_toradex-bsp-common-layer = "sumo"
-LAYERSERIES_COMPAT_toradex-nxp-layer = "sumo"
+LAYERSERIES_COMPAT_toradex-bsp-common-layer = "thud"
+LAYERSERIES_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 @@
+From 2a9d175360f1ed3ef85e336a329a9e803226096e Mon Sep 17 00:00:00 2001
+From: Max Krummenacher <max.oss.09@gmail.com>
+Date: Thu, 29 Oct 2015 19:38:50 +0100
+Subject: [PATCH] systemd-udevd.service.in: set MountFlags=shared
+
+This allows for udevd automounting of drives accessible to all.
+---
+ units/systemd-udevd.service.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/units/systemd-udevd.service.in b/units/systemd-udevd.service.in
+index 6a3814e5d9..e3f3ad3293 100644
+--- a/units/systemd-udevd.service.in
++++ b/units/systemd-udevd.service.in
+@@ -25,7 +25,6 @@ ExecStart=@rootlibexecdir@/systemd-udevd
+ KillMode=mixed
+ WatchdogSec=3min
+ TasksMax=infinity
+-PrivateMounts=yes
+ MemoryDenyWriteExecute=yes
+ RestrictRealtime=yes
+ 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 @@
 ############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -28,8 +28,6 @@
 ############################################################################
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://0001-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch"
-
-SRCREV = "2448644657e5fbfd82299416d218396ee1115ece"
-PV = "20180511"
+SRC_URI += " \
+    file://0001-systemd-udevd.service.in-set-MountFlags-shared.patch \
+"
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 @@
 
   <project name="poky"
            remote="yocto"
-           revision="623b77885051174d0e05198843e739110977bd18"
+           revision="84eecb017ef92ef36b4df730908828e54aeff85c"
            path="sources/poky"/>
   <project name="meta-openembedded"
            remote="oe-mirror"
-           revision="8760facba1bceb299b3613b8955621ddaa3d4c3f"
+           revision="6094ae18c8a35e5cc9998ac39869390d7f3bb1e2"
            path="sources/meta-openembedded"/>
   <project name="meta-qt5"
            remote="qtyocto"
@@ -35,17 +35,17 @@
 
   <project name="meta-freescale"
            remote="freescale"
-           revision="407c6cf408969445031a492e2d25e0e2749582ea"
+           revision="9d1463c9af81edadf8c5a343a030555b6156f8cf"
            path="sources/meta-freescale"
            groups="notdefault,external,fsl,toradex,smx6,boundary,fsl-imx8"/>
   <project name="meta-freescale-3rdparty"
            remote="freescale"
-           revision="88a29631809d1af0df618245430db29f2a7012b5"
+           revision="47848bff9478999019947f69a719b3d2c2a6b558"
            path="sources/meta-freescale-3rdparty"
            groups="notdefault,external,fsl,toradex,smx6,boundary,fsl-imx8"/>
   <project name="meta-raspberrypi"
            remote="yocto"
-           revision="2d40b000021bc8a9ef7f329ed0ad410f8d227b97"
+           revision="a48743dc36e31170cf737e200cc88f273e13611a"
            path="sources/meta-raspberrypi"
            groups="notdefault,external,rpi"/>
   <project name="meta-intel"
@@ -55,7 +55,7 @@
            groups="notdefault,external,intel"/>
   <project name="meta-tegra"
            remote="madisongh"
-           revision="6b6942c8dd15c2b4a460d46e803b962663955fde"
+           revision="da90b42297f5d14d362015be1c5a888f5cac946a"
            path="sources/meta-tegra"
            groups="notdefault,external,jetson"/>
   <project name="meta-renesas"
@@ -75,12 +75,12 @@
            groups="notdefault,external,renesas-gen3,renesas-draak"/>
   <project name="meta-toradex-bsp-common"
            remote="toradex"
-           revision="3e713eef6e056c955b82adaf4b45286a98c3fcdf"
+           revision="b3fe56eec075ccd719b0ec1fde32ad9c37f0cca0"
            path="sources/meta-toradex-bsp-common"
            groups="notdefault,external,toradex"/>
   <project name="meta-toradex-nxp"
            remote="toradex"
-           revision="656677f4a68e6747971a4a30550cd72c3beb6a76"
+           revision="53d4be5b9b8f609ae713e6eea8e935a73f7f7fd6"
            path="sources/meta-toradex-nxp"
            groups="notdefault,external,toradex"/>
   <project name="meta-boundary"