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.inc12
-rw-r--r--meta-boot2qt-distro/conf/layer.conf3
-rw-r--r--meta-boot2qt-distro/recipes-kernel/linux/linux-yocto/uprobe_event.cfg2
-rw-r--r--meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend16
-rw-r--r--meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb6
-rw-r--r--meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend3
-rw-r--r--meta-boot2qt/classes/populate_b2qt_sdk.bbclass2
-rw-r--r--meta-boot2qt/classes/qbsp-image.bbclass2
-rw-r--r--meta-boot2qt/classes/qbsp.bbclass10
-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-boot2qt/recipes-devtools/virtualbox/mount-vboxsf_5.2.26.bb (renamed from meta-boot2qt/recipes-devtools/virtualbox/mount-vboxsf_5.2.18.bb)4
-rw-r--r--meta-boot2qt/recipes-devtools/virtualbox/virtualbox-guest-additions_5.2.26.bb (renamed from meta-boot2qt/recipes-devtools/virtualbox/virtualbox-guest-additions_5.2.18.bb)8
-rw-r--r--meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb8
-rw-r--r--meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb4
-rw-r--r--meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb4
-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-boundary/0001-Add-support-for-KOE-tx31d200vm0baa-display.patch46
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-boundary/0002-set-CMA-reserved-size-to-384MB.patch8
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-boundary/0003-Disable-build-for-tools.patch14
-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-intel-extras/recipes/mesa/files/0001-Simplify-wayland-scanner-lookup.patch39
-rw-r--r--meta-intel-extras/recipes/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch34
-rw-r--r--meta-intel-extras/recipes/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch44
-rw-r--r--meta-intel-extras/recipes/mesa/files/0004-Use-Python-3-to-execute-the-scripts.patch32
-rw-r--r--meta-intel-extras/recipes/mesa/files/0005-dri-i965-Add-missing-time.h-include.patch36
-rw-r--r--meta-intel-extras/recipes/mesa/files/0006-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch37
-rw-r--r--meta-intel-extras/recipes/mesa/mesa.inc233
-rw-r--r--meta-intel-extras/recipes/mesa/mesa_18.1.9.bb21
-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/classes/image_type_tezi_thud.bbclass250
-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.xml24
45 files changed, 541 insertions, 667 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..95a52ee 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,11 @@ 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"
58
59# override tezi bbclass
60IMAGE_CLASSES_remove = " image_type_tezi"
61IMAGE_CLASSES_append = " image_type_tezi_thud"
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-kernel/linux/linux-yocto/uprobe_event.cfg b/meta-boot2qt-distro/recipes-kernel/linux/linux-yocto/uprobe_event.cfg
index aba82da..81f7be9 100644
--- a/meta-boot2qt-distro/recipes-kernel/linux/linux-yocto/uprobe_event.cfg
+++ b/meta-boot2qt-distro/recipes-kernel/linux/linux-yocto/uprobe_event.cfg
@@ -1 +1 @@
CONFIG_UPROBE_EVENT=y CONFIG_UPROBE_EVENTS=y
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-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
index 9fac3f6..8807cf7 100644
--- a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
@@ -37,10 +37,14 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
37 37
38MACHINE_EXTRA_INSTALL_SDK ?= "" 38MACHINE_EXTRA_INSTALL_SDK ?= ""
39 39
40GCC-SANITIZERS ?= "gcc-sanitizers"
41GCC-SANITIZERS_mipsarch = ""
42GCC-SANITIZERS_libc-musl = ""
43
40RDEPENDS_${PN} += " \ 44RDEPENDS_${PN} += " \
41 ${MACHINE_EXTRA_INSTALL_SDK} \ 45 ${MACHINE_EXTRA_INSTALL_SDK} \
42 packagegroup-core-standalone-sdk-target \ 46 packagegroup-core-standalone-sdk-target \
43 ${@contains_regex('MACHINEOVERRIDES', '(x86_64|i.86|powerpc|sparc|s390|arm|aarch64)', 'gcc-sanitizers', '', d)} \ 47 ${GCC-SANITIZERS} \
44 \ 48 \
45 qt3d-dev \ 49 qt3d-dev \
46 qt3d-runtime-dev \ 50 qt3d-runtime-dev \
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
index 36b4409..df45875 100644
--- a/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
+++ b/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
@@ -46,3 +46,6 @@ fakeroot do_generate_qt_environment_file_mingw32() {
46} 46}
47 47
48SRC_URI_append_mingw32 = "file://0001-disable-qt_random_cpu.patch" 48SRC_URI_append_mingw32 = "file://0001-disable-qt_random_cpu.patch"
49
50# qdatetime.cpp: error: 'localtime_r' was not declared in this scope
51QT_CONFIG_FLAGS_append_mingw32 = " -D_POSIX_C_SOURCE"
diff --git a/meta-boot2qt/classes/populate_b2qt_sdk.bbclass b/meta-boot2qt/classes/populate_b2qt_sdk.bbclass
index ad863da..ff4b677 100644
--- a/meta-boot2qt/classes/populate_b2qt_sdk.bbclass
+++ b/meta-boot2qt/classes/populate_b2qt_sdk.bbclass
@@ -57,6 +57,6 @@ fakeroot tar_sdk_sdkmingw32() {
57 if [ -e ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.7z ]; then 57 if [ -e ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.7z ]; then
58 rm ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.7z 58 rm ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.7z
59 fi 59 fi
60 7zr a ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.7z * 60 7za a ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.7z *
61} 61}
62 62
diff --git a/meta-boot2qt/classes/qbsp-image.bbclass b/meta-boot2qt/classes/qbsp-image.bbclass
index 71d1d45..4255194 100644
--- a/meta-boot2qt/classes/qbsp-image.bbclass
+++ b/meta-boot2qt/classes/qbsp-image.bbclass
@@ -53,7 +53,7 @@ fakeroot do_qbsp_image () {
53 done 53 done
54 54
55 cd ${S}/qbsp 55 cd ${S}/qbsp
56 7zr a ${IMGDEPLOYDIR}/${IMAGE_NAME}.7z . 56 7za a ${IMGDEPLOYDIR}/${IMAGE_NAME}.7z .
57 57
58 rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.7z 58 rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.7z
59 ln -s ${IMAGE_NAME}.7z ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.7z 59 ln -s ${IMAGE_NAME}.7z ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.7z
diff --git a/meta-boot2qt/classes/qbsp.bbclass b/meta-boot2qt/classes/qbsp.bbclass
index d61e12b..c5916ce 100644
--- a/meta-boot2qt/classes/qbsp.bbclass
+++ b/meta-boot2qt/classes/qbsp.bbclass
@@ -109,13 +109,13 @@ prepare_qbsp() {
109 109
110 mkdir -p ${B}/toolchain/${QBSP_INSTALL_PATH}/toolchain 110 mkdir -p ${B}/toolchain/${QBSP_INSTALL_PATH}/toolchain
111 if [ "${SDK_POSTFIX}" = "7z" ]; then 111 if [ "${SDK_POSTFIX}" = "7z" ]; then
112 7zr x ${DEPLOY_DIR}/sdk/${SDK_NAME} -o${B}/toolchain/${QBSP_INSTALL_PATH}/toolchain/ 112 7za x ${DEPLOY_DIR}/sdk/${SDK_NAME} -o${B}/toolchain/${QBSP_INSTALL_PATH}/toolchain/
113 else 113 else
114 cp ${DEPLOY_DIR}/sdk/${SDK_NAME} ${B}/toolchain/${QBSP_INSTALL_PATH}/toolchain/ 114 cp ${DEPLOY_DIR}/sdk/${SDK_NAME} ${B}/toolchain/${QBSP_INSTALL_PATH}/toolchain/
115 fi 115 fi
116 116
117 cd ${B}/toolchain 117 cd ${B}/toolchain
118 7zr a ${COMPONENT_PATH}/data/toolchain.7z * 118 7za a ${COMPONENT_PATH}/data/toolchain.7z *
119 119
120 # Image component 120 # Image component
121 COMPONENT_PATH="${B}/pkg/${QBSP_INSTALLER_COMPONENT}.system" 121 COMPONENT_PATH="${B}/pkg/${QBSP_INSTALLER_COMPONENT}.system"
@@ -126,10 +126,10 @@ prepare_qbsp() {
126 patch_installer_files ${COMPONENT_PATH}/meta 126 patch_installer_files ${COMPONENT_PATH}/meta
127 127
128 mkdir -p ${B}/images/${QBSP_INSTALL_PATH}/images 128 mkdir -p ${B}/images/${QBSP_INSTALL_PATH}/images
129 7zr x ${DEPLOY_DIR_IMAGE}/${IMAGE_PACKAGE} -o${B}/images/${QBSP_INSTALL_PATH}/images/ 129 7za x ${DEPLOY_DIR_IMAGE}/${IMAGE_PACKAGE} -o${B}/images/${QBSP_INSTALL_PATH}/images/
130 130
131 cd ${B}/images 131 cd ${B}/images
132 7zr a ${COMPONENT_PATH}/data/image.7z * 132 7za a ${COMPONENT_PATH}/data/image.7z *
133 133
134 # License component 134 # License component
135 if [ -n "${QBSP_LICENSE_FILE}" ]; then 135 if [ -n "${QBSP_LICENSE_FILE}" ]; then
@@ -160,7 +160,7 @@ create_qbsp() {
160 rm -f ${DEPLOY_DIR}/qbsp/${PN}-${SDK_MACHINE}-${MACHINE}-${PV}.qbsp 160 rm -f ${DEPLOY_DIR}/qbsp/${PN}-${SDK_MACHINE}-${MACHINE}-${PV}.qbsp
161 161
162 cd ${B}/repository 162 cd ${B}/repository
163 7zr a ${DEPLOY_DIR}/qbsp/${PN}-${SDK_MACHINE}-${MACHINE}-${PV}.qbsp * 163 7za a ${DEPLOY_DIR}/qbsp/${PN}-${SDK_MACHINE}-${MACHINE}-${PV}.qbsp *
164} 164}
165 165
166python do_qbsp() { 166python do_qbsp() {
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-boot2qt/recipes-devtools/virtualbox/mount-vboxsf_5.2.18.bb b/meta-boot2qt/recipes-devtools/virtualbox/mount-vboxsf_5.2.26.bb
index 6dba661..c03236d 100644
--- a/meta-boot2qt/recipes-devtools/virtualbox/mount-vboxsf_5.2.18.bb
+++ b/meta-boot2qt/recipes-devtools/virtualbox/mount-vboxsf_5.2.26.bb
@@ -36,8 +36,8 @@ SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/VirtualBox-${PV}.tar.
36 file://mount-vboxsf.service \ 36 file://mount-vboxsf.service \
37 " 37 "
38 38
39SRC_URI[md5sum] = "d8e291525b84569356773eef507c49ce" 39SRC_URI[md5sum] = "4e84cd1aecb67e3f59b3ee06292bb2d0"
40SRC_URI[sha256sum] = "ed0a7efd56c7f39fae79c7ec3321473da412ef0d7914457b66f42679d513efcf" 40SRC_URI[sha256sum] = "4debe583463be3917ac60ad76a31f6db27586423d86f1f53c060d70d5e70d467"
41 41
42S = "${WORKDIR}/VirtualBox-${PV}/src/VBox/Additions/linux/sharedfolders" 42S = "${WORKDIR}/VirtualBox-${PV}/src/VBox/Additions/linux/sharedfolders"
43 43
diff --git a/meta-boot2qt/recipes-devtools/virtualbox/virtualbox-guest-additions_5.2.18.bb b/meta-boot2qt/recipes-devtools/virtualbox/virtualbox-guest-additions_5.2.26.bb
index a727c6f..5151cc2 100644
--- a/meta-boot2qt/recipes-devtools/virtualbox/virtualbox-guest-additions_5.2.18.bb
+++ b/meta-boot2qt/recipes-devtools/virtualbox/virtualbox-guest-additions_5.2.26.bb
@@ -38,8 +38,8 @@ PR = "${MACHINE_KERNEL_PR}"
38 38
39SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/VirtualBox-${PV}.tar.bz2" 39SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/VirtualBox-${PV}.tar.bz2"
40 40
41SRC_URI[md5sum] = "d8e291525b84569356773eef507c49ce" 41SRC_URI[md5sum] = "4e84cd1aecb67e3f59b3ee06292bb2d0"
42SRC_URI[sha256sum] = "ed0a7efd56c7f39fae79c7ec3321473da412ef0d7914457b66f42679d513efcf" 42SRC_URI[sha256sum] = "4debe583463be3917ac60ad76a31f6db27586423d86f1f53c060d70d5e70d467"
43 43
44S = "${WORKDIR}/vbox" 44S = "${WORKDIR}/vbox"
45 45
@@ -48,10 +48,12 @@ export KERN_VER="${KERNEL_VERSION}"
48export KBUILD_VERBOSE="1" 48export KBUILD_VERBOSE="1"
49export BUILD_TARGET_ARCH="${ARCH}" 49export BUILD_TARGET_ARCH="${ARCH}"
50 50
51do_compile_prepend() { 51do_compile() {
52 ${WORKDIR}/VirtualBox-${PV}/src/VBox/Additions/linux/export_modules.sh ${WORKDIR}/vbox.tar.gz 52 ${WORKDIR}/VirtualBox-${PV}/src/VBox/Additions/linux/export_modules.sh ${WORKDIR}/vbox.tar.gz
53 tar xf ${WORKDIR}/vbox.tar.gz -C ${WORKDIR}/vbox 53 tar xf ${WORKDIR}/vbox.tar.gz -C ${WORKDIR}/vbox
54 find ${WORKDIR}/vbox -name Makefile.include.header | xargs sed -i -e '/KERN_DIR :=/d' 54 find ${WORKDIR}/vbox -name Makefile.include.header | xargs sed -i -e '/KERN_DIR :=/d'
55
56 oe_runmake all || die "make failed"
55} 57}
56 58
57do_install() { 59do_install() {
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb
index 225cdb8..8c0237b 100644
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb
@@ -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.
@@ -42,11 +42,11 @@ SRC_URI = " \
42 https://qt-files.s3.amazonaws.com/examples/Videos/The+Future+is+Written+with+Qt.mp4;name=video3 \ 42 https://qt-files.s3.amazonaws.com/examples/Videos/The+Future+is+Written+with+Qt.mp4;name=video3 \
43 " 43 "
44 44
45PV = "5.12.1+git${SRCPV}" 45PV = "5.13.0+git${SRCPV}"
46 46
47BRANCH = "5.12" 47BRANCH = "5.13"
48 48
49SRCREV = "ec7cc518acc087f9366db2fc34139807df4e7398" 49SRCREV = "0ea39397893edb54454bfceabde4b83fc5b60a2e"
50 50
51SRC_URI[video1.md5sum] = "25d9e963a02675a4f3ba83abeebb32da" 51SRC_URI[video1.md5sum] = "25d9e963a02675a4f3ba83abeebb32da"
52SRC_URI[video1.sha256sum] = "33125518c2eb7848f378ddb6bebaf39f3327c92f1e33daa7fc09e4260e54d54a" 52SRC_URI[video1.sha256sum] = "33125518c2eb7848f378ddb6bebaf39f3327c92f1e33daa7fc09e4260e54d54a"
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb
index 866d109..e067b57 100644
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb
@@ -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.
@@ -43,7 +43,7 @@ SRC_URI += " \
43 file://ebikedata.service \ 43 file://ebikedata.service \
44 " 44 "
45 45
46SRCREV = "1a9567ff314fd737b52bffb3195d64b600252c59" 46SRCREV = "747d70eaa865aad25b0ee680a0090c059a0549a9"
47 47
48DEPENDS = "\ 48DEPENDS = "\
49 qtbase qtdeclarative qtquickcontrols2 \ 49 qtbase qtdeclarative qtquickcontrols2 \
diff --git a/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb b/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb
index b886099..de2931e 100644
--- a/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb
+++ b/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb
@@ -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.
@@ -39,7 +39,7 @@ PACKAGECONFIG[wpasupplicant] = "CONFIG+=wpasupplicant,,wpa-supplicant"
39 39
40EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 40EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
41 41
42SRCREV = "76ab4f6568e7c81bfc1b2e53ed7a33898e086f8a" 42SRCREV = "0b7e135bfbe8fbb40ec97ed1d643429418a93f61"
43 43
44DEPENDS = "\ 44DEPENDS = "\
45 qtbase qtdeclarative qtconnectivity qtdeclarative-native \ 45 qtbase qtdeclarative qtconnectivity qtdeclarative-native \
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-boundary/0001-Add-support-for-KOE-tx31d200vm0baa-display.patch b/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0001-Add-support-for-KOE-tx31d200vm0baa-display.patch
index 123782e..9378f0a 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0001-Add-support-for-KOE-tx31d200vm0baa-display.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0001-Add-support-for-KOE-tx31d200vm0baa-display.patch
@@ -1,21 +1,21 @@
1From 07234c1c0f991a560010672a619740e385778f90 Mon Sep 17 00:00:00 2001 1From ea15ee300074cb1453dce6a068feec0771a28418 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@theqtcompany.com> 2From: Samuli Piippo <samuli.piippo@theqtcompany.com>
3Date: Thu, 11 Feb 2016 10:17:51 +0200 3Date: Thu, 11 Feb 2016 10:17:51 +0200
4Subject: [PATCH] Add support for KOE tx31d200vm0baa display 4Subject: [PATCH] Add support for KOE tx31d200vm0baa display
5 5
6Used for the cluster demo 6Used for the cluster demo
7--- 7---
8 arch/arm/include/asm/imx-common/fbpanel.h | 27 ++++++++++++++++++++ 8 arch/arm/include/asm/mach-imx/fbpanel.h | 27 ++++++++++++++++++++
9 board/boundary/nitrogen6_max/nitrogen6_max.c | 1 + 9 board/boundary/nitrogen6_max/nitrogen6_max.c | 3 ++-
10 board/boundary/nitrogen6sx/nitrogen6sx.c | 1 + 10 board/boundary/nitrogen6sx/nitrogen6sx.c | 3 ++-
11 board/boundary/nitrogen6x/nitrogen6x.c | 1 + 11 board/boundary/nitrogen6x/nitrogen6x.c | 3 ++-
12 4 files changed, 30 insertions(+) 12 4 files changed, 33 insertions(+), 3 deletions(-)
13 13
14diff --git a/arch/arm/include/asm/imx-common/fbpanel.h b/arch/arm/include/asm/imx-common/fbpanel.h 14diff --git a/arch/arm/include/asm/mach-imx/fbpanel.h b/arch/arm/include/asm/mach-imx/fbpanel.h
15index f5465c3c80..643cd86e29 100644 15index 4b924d2ac8..d4ef998faf 100644
16--- a/arch/arm/include/asm/imx-common/fbpanel.h 16--- a/arch/arm/include/asm/mach-imx/fbpanel.h
17+++ b/arch/arm/include/asm/imx-common/fbpanel.h 17+++ b/arch/arm/include/asm/mach-imx/fbpanel.h
18@@ -116,6 +116,33 @@ void fbp_setup_display(const struct display_info_t *displays, int cnt); 18@@ -174,6 +174,33 @@ void fbp_setup_env_cmds(void);
19 .fbtype = FB_##_mode,\ 19 .fbtype = FB_##_mode,\
20 .fbflags = _flags 20 .fbflags = _flags
21 21
@@ -50,38 +50,44 @@ index f5465c3c80..643cd86e29 100644
50 #define VDF_1280_720M_60(_mode, _name, _fmt, _flags, _detect, _bus, _addr) \ 50 #define VDF_1280_720M_60(_mode, _name, _fmt, _flags, _detect, _bus, _addr) \
51 {\ 51 {\
52diff --git a/board/boundary/nitrogen6_max/nitrogen6_max.c b/board/boundary/nitrogen6_max/nitrogen6_max.c 52diff --git a/board/boundary/nitrogen6_max/nitrogen6_max.c b/board/boundary/nitrogen6_max/nitrogen6_max.c
53index 1c4106e735..51bc0bd8f3 100644 53index 12e3af89d0..3be475efc0 100644
54--- a/board/boundary/nitrogen6_max/nitrogen6_max.c 54--- a/board/boundary/nitrogen6_max/nitrogen6_max.c
55+++ b/board/boundary/nitrogen6_max/nitrogen6_max.c 55+++ b/board/boundary/nitrogen6_max/nitrogen6_max.c
56@@ -497,6 +497,7 @@ int fbp_detect_serializer(struct display_info_t const *di) 56@@ -499,7 +499,8 @@ int fbp_detect_serializer(struct display_info_t const *di)
57 } 57 }
58 58
59 static const struct display_info_t displays[] = { 59 static const struct display_info_t displays[] = {
60- /* hdmi */
60+ IMX_VD_KOE(LVDS, 0, 2), 61+ IMX_VD_KOE(LVDS, 0, 2),
61 /* hdmi */ 62+ /* hdmi */
62 VD_1280_720M_60(HDMI, fbp_detect_i2c, 1, 0x50), 63 VD_1280_720M_60(HDMI, fbp_detect_i2c, 1, 0x50),
63 VD_1920_1080M_60(HDMI, NULL, 1, 0x50), 64 VD_1920_1080M_60(HDMI, NULL, 1, 0x50),
65 VD_1024_768M_60(HDMI, NULL, 1, 0x50),
64diff --git a/board/boundary/nitrogen6sx/nitrogen6sx.c b/board/boundary/nitrogen6sx/nitrogen6sx.c 66diff --git a/board/boundary/nitrogen6sx/nitrogen6sx.c b/board/boundary/nitrogen6sx/nitrogen6sx.c
65index dc05042add..3725d63cf3 100644 67index 5581637424..5ded443c78 100644
66--- a/board/boundary/nitrogen6sx/nitrogen6sx.c 68--- a/board/boundary/nitrogen6sx/nitrogen6sx.c
67+++ b/board/boundary/nitrogen6sx/nitrogen6sx.c 69+++ b/board/boundary/nitrogen6sx/nitrogen6sx.c
68@@ -436,6 +436,7 @@ void board_enable_lcd(const struct display_info_t *di, int enable) 70@@ -435,7 +435,8 @@ void board_enable_lcd(const struct display_info_t *di, int enable)
69 } 71 }
70 72
71 static const struct display_info_t displays[] = { 73 static const struct display_info_t displays[] = {
74- /* hdmi/lcd via tfp410 */
72+ IMX_VD_KOE(LVDS, 0, 2), 75+ IMX_VD_KOE(LVDS, 0, 2),
73 /* hdmi/lcd via tfp410 */ 76+ /* hdmi/lcd via tfp410 */
74 VDF_1280_720M_60(LCD, "1280x720M@60", RGB24, 0, fbp_detect_i2c, 2, 0x50), 77 VDF_1280_720M_60(LCD, "1280x720M@60", RGB24, 0, fbp_detect_i2c, 2, 0x50),
75 VDF_1920_1080M_60(LCD, "1920x1080M@60", RGB24, 0, NULL, 2, 0x50), 78 VDF_1920_1080M_60(LCD, "1920x1080M@60", RGB24, 0, NULL, 2, 0x50),
79 VDF_1024_768M_60(LCD, "1024x768M@60", RGB24, 0, NULL, 2, 0x50),
76diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c 80diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c
77index d9f6a829f1..80b102e206 100644 81index 8ee7f641bf..dbf1bd4a99 100644
78--- a/board/boundary/nitrogen6x/nitrogen6x.c 82--- a/board/boundary/nitrogen6x/nitrogen6x.c
79+++ b/board/boundary/nitrogen6x/nitrogen6x.c 83+++ b/board/boundary/nitrogen6x/nitrogen6x.c
80@@ -359,6 +359,7 @@ void board_pre_enable(const struct display_info_t *di) 84@@ -362,7 +362,8 @@ void board_pre_enable(const struct display_info_t *di)
81 } 85 }
82 86
83 static const struct display_info_t displays[] = { 87 static const struct display_info_t displays[] = {
88- /* hdmi */
84+ IMX_VD_KOE(LVDS, 0, 2), 89+ IMX_VD_KOE(LVDS, 0, 2),
85 /* hdmi */ 90+ /* hdmi */
86 VD_1280_720M_60(HDMI, fbp_detect_i2c, 1, 0x50), 91 VD_1280_720M_60(HDMI, fbp_detect_i2c, 1, 0x50),
87 VD_1920_1080M_60(HDMI, NULL, 1, 0x50), 92 VD_1920_1080M_60(HDMI, NULL, 1, 0x50),
93 VD_1024_768M_60(HDMI, NULL, 1, 0x50),
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0002-set-CMA-reserved-size-to-384MB.patch b/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0002-set-CMA-reserved-size-to-384MB.patch
index b0791e9..d730e60 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0002-set-CMA-reserved-size-to-384MB.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0002-set-CMA-reserved-size-to-384MB.patch
@@ -1,4 +1,4 @@
1From fa2e83db63fe5abdfa00d205301d12e1a271a291 Mon Sep 17 00:00:00 2001 1From e21337ad1663e6fd6da4a5175ad72e629c62bab5 Mon Sep 17 00:00:00 2001
2From: Mikko Gronoff <mikko.gronoff@qt.io> 2From: Mikko Gronoff <mikko.gronoff@qt.io>
3Date: Sun, 23 Apr 2017 21:47:01 +0300 3Date: Sun, 23 Apr 2017 21:47:01 +0300
4Subject: [PATCH] set CMA reserved size to 384MB 4Subject: [PATCH] set CMA reserved size to 384MB
@@ -10,14 +10,14 @@ video decoding cannot work for high resolution videos.
10 1 file changed, 1 insertion(+) 10 1 file changed, 1 insertion(+)
11 11
12diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h 12diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
13index bd4e54cb67..48114d5739 100644 13index 62708b839b..eb3b30b2ce 100644
14--- a/include/configs/nitrogen6x.h 14--- a/include/configs/nitrogen6x.h
15+++ b/include/configs/nitrogen6x.h 15+++ b/include/configs/nitrogen6x.h
16@@ -33,6 +33,7 @@ 16@@ -26,6 +26,7 @@
17 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 17 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
18 18
19 #define BD_I2C_MASK 7 19 #define BD_I2C_MASK 7
20+#define BD_CMA "384M" 20+#define BD_CMA "384M"
21 21
22 #if defined(CONFIG_SABRELITE) 22 #if defined(CONFIG_SABRELITE)
23 #define CONFIG_ENV_IS_IN_MMC 23 #include "boundary.h"
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0003-Disable-build-for-tools.patch b/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0003-Disable-build-for-tools.patch
index c5fa923..49af5e5 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0003-Disable-build-for-tools.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0003-Disable-build-for-tools.patch
@@ -1,4 +1,4 @@
1From 22c5a278b98cf6ea4e4a402bca19d1354ab3c431 Mon Sep 17 00:00:00 2001 1From baed831959ba41b8d1cebfb5d960ddfa847ae915 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Tue, 25 Sep 2018 16:05:17 +0300 3Date: Tue, 25 Sep 2018 16:05:17 +0300
4Subject: [PATCH] Disable build for tools and use mkimage from sysroot 4Subject: [PATCH] Disable build for tools and use mkimage from sysroot
@@ -11,10 +11,10 @@ fails when trying to compile with host gcc: unable to execute
11 2 files changed, 2 insertions(+), 2 deletions(-) 11 2 files changed, 2 insertions(+), 2 deletions(-)
12 12
13diff --git a/Makefile b/Makefile 13diff --git a/Makefile b/Makefile
14index 119ad49eec..022690e26e 100644 14index 7d5f801eea..d5d44c5def 100644
15--- a/Makefile 15--- a/Makefile
16+++ b/Makefile 16+++ b/Makefile
17@@ -698,7 +698,7 @@ libs-y += $(if $(BOARDDIR),board/$(BOARDDIR)/) 17@@ -730,7 +730,7 @@ libs-y += $(if $(BOARDDIR),board/$(BOARDDIR)/)
18 18
19 libs-y := $(sort $(libs-y)) 19 libs-y := $(sort $(libs-y))
20 20
@@ -24,13 +24,15 @@ index 119ad49eec..022690e26e 100644
24 u-boot-alldirs := $(sort $(u-boot-dirs) $(patsubst %/,%,$(filter %/, $(libs-)))) 24 u-boot-alldirs := $(sort $(u-boot-dirs) $(patsubst %/,%,$(filter %/, $(libs-))))
25 25
26diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib 26diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
27index 80ddb08474..e86c949f08 100644 27index f8c3fff1d1..f24ea9cc25 100644
28--- a/scripts/Makefile.lib 28--- a/scripts/Makefile.lib
29+++ b/scripts/Makefile.lib 29+++ b/scripts/Makefile.lib
30@@ -493,5 +493,5 @@ cmd_xzmisc = (cat $(filter-out FORCE,$^) | \ 30@@ -508,7 +508,7 @@ cmd_xzmisc = (cat $(filter-out FORCE,$^) | \
31 # --------------------------------------------------------------------------- 31 # ---------------------------------------------------------------------------
32 MKIMAGEOUTPUT ?= /dev/null 32 MKIMAGEOUTPUT ?= /dev/null
33 quiet_cmd_mkimage = MKIMAGE $@ 33 quiet_cmd_mkimage = MKIMAGE $@
34-cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \ 34-cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \
35+cmd_mkimage = mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \ 35+cmd_mkimage = mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \
36 $(if $(KBUILD_VERBOSE:1=), >$(MKIMAGEOUTPUT)) 36 >$(MKIMAGEOUTPUT) $(if $(KBUILD_VERBOSE:0=), && cat $(MKIMAGEOUTPUT))
37
38 # fdtgrep
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-intel-extras/recipes/mesa/files/0001-Simplify-wayland-scanner-lookup.patch b/meta-intel-extras/recipes/mesa/files/0001-Simplify-wayland-scanner-lookup.patch
deleted file mode 100644
index a50d2a2..0000000
--- a/meta-intel-extras/recipes/mesa/files/0001-Simplify-wayland-scanner-lookup.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 7e8e0f8a8ac2425e19a2f340c9e3da9345f25940 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Tue, 15 Nov 2016 15:20:49 +0200
4Subject: [PATCH 1/6] Simplify wayland-scanner lookup
5Organization: O.S. Systems Software LTDA.
6
7Don't use pkg-config to lookup the path of a binary that's in the path.
8
9Alternatively we'd have to prefix the path returned by pkg-config with
10PKG_CONFIG_SYSROOT_DIR.
11
12Upstream-Status: Pending
13Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
14Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
15---
16 configure.ac | 7 +------
17 1 file changed, 1 insertion(+), 6 deletions(-)
18
19diff --git a/configure.ac b/configure.ac
20index 14f1af2b2f..916d0bd207 100644
21--- a/configure.ac
22+++ b/configure.ac
23@@ -1825,12 +1825,7 @@ for plat in $platforms; do
24 PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED])
25 WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
26
27- PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
28- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
29- WAYLAND_SCANNER='')
30- if test "x$WAYLAND_SCANNER" = x; then
31- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
32- fi
33+ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
34
35 if test "x$WAYLAND_SCANNER" = "x:"; then
36 AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform])
37--
382.18.0
39
diff --git a/meta-intel-extras/recipes/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch b/meta-intel-extras/recipes/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch
deleted file mode 100644
index ffb3bf7..0000000
--- a/meta-intel-extras/recipes/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 7792f228991744a0396b8bf811e281dca86165d3 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 16 Aug 2017 18:58:20 -0700
4Subject: [PATCH 2/6] winsys/svga/drm: Include sys/types.h
5Organization: O.S. Systems Software LTDA.
6
7vmw_screen.h uses dev_t which is defines in sys/types.h
8this header is required to be included for getting dev_t
9definition. This issue happens on musl C library, it is hidden
10on glibc since sys/types.h is included through another
11system headers
12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14Upstream-Status: Backport [7dfdfbf8c37e52e7b9b09f7d1d434edad3ebc864]
15Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
16---
17 src/gallium/winsys/svga/drm/vmw_screen.h | 1 +
18 1 file changed, 1 insertion(+)
19
20diff --git a/src/gallium/winsys/svga/drm/vmw_screen.h b/src/gallium/winsys/svga/drm/vmw_screen.h
21index f21cabb51f..4c972fdaa9 100644
22--- a/src/gallium/winsys/svga/drm/vmw_screen.h
23+++ b/src/gallium/winsys/svga/drm/vmw_screen.h
24@@ -41,6 +41,7 @@
25 #include "svga_winsys.h"
26 #include "pipebuffer/pb_buffer_fenced.h"
27 #include <os/os_thread.h>
28+#include <sys/types.h>
29
30 #define VMW_GMR_POOL_SIZE (16*1024*1024)
31 #define VMW_QUERY_POOL_SIZE (8192)
32--
332.18.0
34
diff --git a/meta-intel-extras/recipes/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch b/meta-intel-extras/recipes/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch
deleted file mode 100644
index 5e735ca..0000000
--- a/meta-intel-extras/recipes/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From 8b42fb47138f91d9378439ab716bac7701e4e326 Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Tue, 5 Jun 2018 11:11:10 -0300
4Subject: [PATCH 3/6] Properly get LLVM version when using LLVM Git releases
5Organization: O.S. Systems Software LTDA.
6
7$ llvm-config-host --version
85.0.0git-9a5c333388c
9
10We need to ignore everything after 5.0.0 which is what the cut cmd is
11doing
12
13Upstream-Status: Pending
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
16---
17 configure.ac | 4 ++--
18 1 file changed, 2 insertions(+), 2 deletions(-)
19
20diff --git a/configure.ac b/configure.ac
21index 916d0bd207..dd172f1ebe 100644
22--- a/configure.ac
23+++ b/configure.ac
24@@ -1090,7 +1090,7 @@ strip_unwanted_llvm_flags() {
25
26 llvm_set_environment_variables() {
27 if test "x$LLVM_CONFIG" != xno; then
28- LLVM_VERSION=`$LLVM_CONFIG --version | egrep -o '^[[0-9.]]+'`
29+ LLVM_VERSION=`$LLVM_CONFIG --version | cut -c1-5`
30 LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"`
31 LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir`
32 LLVM_LIBDIR=`$LLVM_CONFIG --libdir`
33@@ -2808,7 +2808,7 @@ detect_old_buggy_llvm() {
34 dnl ourselves.
35 dnl (See https://llvm.org/bugs/show_bug.cgi?id=6823)
36 dnl We can't use $LLVM_VERSION because it has 'svn' stripped out,
37- LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version`
38+ LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version | cut -c1-5`
39 AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.$IMP_LIB_EXT"], [llvm_have_one_so=yes])
40
41 if test "x$llvm_have_one_so" = xyes; then
42--
432.18.0
44
diff --git a/meta-intel-extras/recipes/mesa/files/0004-Use-Python-3-to-execute-the-scripts.patch b/meta-intel-extras/recipes/mesa/files/0004-Use-Python-3-to-execute-the-scripts.patch
deleted file mode 100644
index 8953c4a..0000000
--- a/meta-intel-extras/recipes/mesa/files/0004-Use-Python-3-to-execute-the-scripts.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From ebe6077a1d74e56b28249f71e8760295fa846ed2 Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Fri, 29 Dec 2017 10:27:59 -0200
4Subject: [PATCH 4/6] Use Python 3 to execute the scripts
5Organization: O.S. Systems Software LTDA.
6
7The MESA build system uses Python 2 but as OE-Core has moved away from
8it, we change it to use Python 3 instead.
9
10Upstream-Status: Inappropriate [ configuration ]
11
12Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
13---
14 configure.ac | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/configure.ac b/configure.ac
18index dd172f1ebe..40cac36ac2 100644
19--- a/configure.ac
20+++ b/configure.ac
21@@ -122,7 +122,7 @@ AM_PROG_CC_C_O
22 AC_PROG_NM
23 AM_PROG_AS
24 AX_CHECK_GNU_MAKE
25-AC_CHECK_PROGS([PYTHON2], [python2.7 python2 python])
26+AC_CHECK_PROGS([PYTHON2], [python3.5 python3 python])
27 AC_PROG_SED
28 AC_PROG_MKDIR_P
29
30--
312.18.0
32
diff --git a/meta-intel-extras/recipes/mesa/files/0005-dri-i965-Add-missing-time.h-include.patch b/meta-intel-extras/recipes/mesa/files/0005-dri-i965-Add-missing-time.h-include.patch
deleted file mode 100644
index d40e7b5..0000000
--- a/meta-intel-extras/recipes/mesa/files/0005-dri-i965-Add-missing-time.h-include.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 9e0368af471af3a36e0eb526453f892598120065 Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Wed, 6 Jun 2018 09:50:35 -0300
4Subject: [PATCH 5/6] dri: i965: Add missing time.h include
5Organization: O.S. Systems Software LTDA.
6
7This fixes a build error when using musl:
8
9,----
10| In file included from .../src/mesa/drivers/dri/i965/intel_upload.c:33:0:
11| .../src/mesa/drivers/dri/i965/brw_bufmgr.h:132:4: error: unknown type name 'time_t'
12| time_t free_time;
13| ^~~~~~
14`----
15
16Upstream-Status: Backport [3c288da5eec81ee58b85927df18d9194ead8f5c2]
17Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
18---
19 src/mesa/drivers/dri/i965/brw_bufmgr.h | 1 +
20 1 file changed, 1 insertion(+)
21
22diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.h b/src/mesa/drivers/dri/i965/brw_bufmgr.h
23index 68f5e0c2c8..5b60a23763 100644
24--- a/src/mesa/drivers/dri/i965/brw_bufmgr.h
25+++ b/src/mesa/drivers/dri/i965/brw_bufmgr.h
26@@ -37,6 +37,7 @@
27 #include <stdbool.h>
28 #include <stdint.h>
29 #include <stdio.h>
30+#include <time.h>
31 #include "util/u_atomic.h"
32 #include "util/list.h"
33
34--
352.18.0
36
diff --git a/meta-intel-extras/recipes/mesa/files/0006-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch b/meta-intel-extras/recipes/mesa/files/0006-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch
deleted file mode 100644
index 0212922..0000000
--- a/meta-intel-extras/recipes/mesa/files/0006-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From 754ccf89a732fc3da6e9bc62ebd6b28686ff3d26 Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Wed, 29 Aug 2018 22:10:30 -0300
4Subject: [PATCH 6/6] use PKG_CHECK_VAR for defining WAYLAND_PROTOCOLS_DATADIR
5Organization: O.S. Systems Software LTDA.
6
7This allows to override the wayland-protocols pkgdatadir with the
8WAYLAND_PROTOCOLS_DATADIR from environment.
9
10pkgconfig would return an absolute path in
11/usr/share/wayland-protocols
12for the pkgdatadir value, which is not suitable for cross-compiling.
13
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15Upstream-Status: Pending
16
17Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
18---
19 configure.ac | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/configure.ac b/configure.ac
23index 40cac36ac2..728bbdcbc4 100644
24--- a/configure.ac
25+++ b/configure.ac
26@@ -1823,7 +1823,7 @@ for plat in $platforms; do
27 PKG_CHECK_MODULES([WAYLAND_CLIENT], [wayland-client >= $WAYLAND_REQUIRED])
28 PKG_CHECK_MODULES([WAYLAND_SERVER], [wayland-server >= $WAYLAND_REQUIRED])
29 PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED])
30- WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
31+ PKG_CHECK_VAR([WAYLAND_PROTOCOLS_DATADIR], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], pkgdatadir)
32
33 AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
34
35--
362.18.0
37
diff --git a/meta-intel-extras/recipes/mesa/mesa.inc b/meta-intel-extras/recipes/mesa/mesa.inc
deleted file mode 100644
index 0219ded..0000000
--- a/meta-intel-extras/recipes/mesa/mesa.inc
+++ /dev/null
@@ -1,233 +0,0 @@
1SUMMARY = "A free implementation of the OpenGL API"
2DESCRIPTION = "Mesa is an open-source implementation of the OpenGL specification - \
3a system for rendering interactive 3D graphics. \
4A variety of device drivers allows Mesa to be used in many different environments \
5ranging from software emulation to complete hardware acceleration for modern GPUs. \
6Mesa is used as part of the overall Direct Rendering Infrastructure and X.org \
7environment."
8
9HOMEPAGE = "http://mesa3d.org"
10BUGTRACKER = "https://bugs.freedesktop.org"
11SECTION = "x11"
12LICENSE = "MIT"
13LIC_FILES_CHKSUM = "file://docs/license.html;md5=725f991a1cc322aa7a0cd3a2016621c4"
14
15PE = "2"
16
17DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native zlib chrpath-replacement-native"
18EXTRANATIVEPATH += "chrpath-native"
19PROVIDES = " \
20 ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'virtual/libgl', '', d)} \
21 ${@bb.utils.contains('PACKAGECONFIG', 'gles', 'virtual/libgles1 virtual/libgles2', '', d)} \
22 ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'virtual/egl', '', d)} \
23 ${@bb.utils.contains('PACKAGECONFIG', 'gbm', 'virtual/libgbm', '', d)} \
24 virtual/mesa \
25 "
26
27inherit autotools pkgconfig python3native gettext distro_features_check
28
29ANY_OF_DISTRO_FEATURES = "opengl vulkan"
30
31PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)} \
32 ${@bb.utils.contains('PACKAGECONFIG', 'gbm', 'drm', '', d)} \
33 surfaceless"
34
35export LLVM_CONFIG = "${STAGING_BINDIR_NATIVE}/llvm-config${MESA_LLVM_RELEASE}"
36export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm${MESA_LLVM_RELEASE}/llvm-config"
37export YOCTO_ALTERNATE_MULTILIB_NAME = "${base_libdir}"
38EXTRA_OECONF = "--enable-shared-glapi \
39 --disable-opencl \
40 --enable-glx-read-only-text \
41 PYTHON2=python2 \
42 --with-llvm-prefix=${STAGING_LIBDIR}/llvm${MESA_LLVM_RELEASE} \
43 --with-platforms='${PLATFORMS}'"
44
45PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland vulkan', d)} \
46 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl egl gles gbm dri', '', d)} \
47 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)} \
48 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan', 'dri3', '', d)} \
49 "
50
51# "gbm" requires "dri", "opengl"
52PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm"
53
54X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
55# "x11" requires "opengl"
56PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}"
57PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc"
58PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols"
59
60DRIDRIVERS = "swrast"
61DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915"
62DRIDRIVERS_append_x86-64 = ",radeon,r200,nouveau,i965,i915"
63# "dri" requires "opengl"
64PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, dri2proto libdrm"
65PACKAGECONFIG[dri3] = "--enable-dri3, --disable-dri3, dri3proto presentproto libxshmfence"
66
67# Vulkan drivers need dri3 enabled
68# radeon could be enabled as well but requires gallium-llvm with llvm >= 3.9
69VULKAN_DRIVERS = ""
70VULKAN_DRIVERS_append_x86 = ",intel"
71VULKAN_DRIVERS_append_x86-64 = ",intel"
72PACKAGECONFIG[vulkan] = "--with-vulkan-drivers=${VULKAN_DRIVERS}, --without-vulkan-drivers, python3-mako-native"
73
74PACKAGECONFIG[opengl] = "--enable-opengl, --disable-opengl"
75
76# "gles" requires "opengl"
77PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-gles2"
78
79# "egl" requires "dri", "opengl"
80PACKAGECONFIG[egl] = "--enable-egl, --disable-egl"
81
82PACKAGECONFIG[etnaviv] = ""
83PACKAGECONFIG[imx] = ""
84
85GALLIUMDRIVERS = "swrast"
86GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'etnaviv', ',etnaviv', '', d)}"
87GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'imx', ',imx', '', d)}"
88GALLIUMDRIVERS_LLVM33 = "${@bb.utils.contains('PACKAGECONFIG', 'r600', 'radeonsi,r600', '', d)}"
89PACKAGECONFIG[r600] = ""
90GALLIUMDRIVERS_LLVM33_ENABLED = "${@oe.utils.version_less_or_equal('MESA_LLVM_RELEASE', '3.2', False, len('${GALLIUMDRIVERS_LLVM33}') > 0, d)}"
91GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${@',${GALLIUMDRIVERS_LLVM33}' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}"
92GALLIUMDRIVERS_append_x86 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}"
93GALLIUMDRIVERS_append_x86-64 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}"
94GALLIUMDRIVERS_append_qemux86 = ",virgl"
95GALLIUMDRIVERS_append_qemux86-64 = ",virgl"
96# keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers
97PACKAGECONFIG[gallium] = "--enable-texture-float --with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers"
98MESA_LLVM_RELEASE ?= "6.0"
99PACKAGECONFIG[gallium-llvm] = "--enable-llvm --enable-llvm-shared-libs, --disable-llvm, llvm${MESA_LLVM_RELEASE} llvm-native \
100 ${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}"
101export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}"
102PACKAGECONFIG[xa] = "--enable-xa, --disable-xa"
103
104OSMESA = "${@bb.utils.contains('PACKAGECONFIG', 'gallium', 'gallium-osmesa', 'osmesa', d)}"
105PACKAGECONFIG[osmesa] = "--enable-${OSMESA},--disable-${OSMESA}"
106
107PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind"
108
109EXTRA_OECONF_remove_libc-musl = "--enable-glx-tls"
110EXTRA_OECONF_append_libc-musl = " --disable-glx-tls"
111EXTRA_OECONF_append_libc-musl_x86 = " --disable-asm"
112
113# llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2)
114FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer"
115
116CFLAGS_append_armv5 = " -DMISSING_64BIT_ATOMICS"
117EXTRA_OEMAKE += "WAYLAND_PROTOCOLS_DATADIR=${STAGING_DATADIR}/wayland-protocols"
118
119# Remove the mesa dependency on mesa-dev, as mesa is empty
120RDEPENDS_${PN}-dev = ""
121
122# Add dependency so that GLES3 header don't need to be added manually
123RDEPENDS_libgles2-mesa-dev += "libgles3-mesa-dev"
124
125PACKAGES =+ "libegl-mesa libegl-mesa-dev \
126 libosmesa libosmesa-dev \
127 libgl-mesa libgl-mesa-dev \
128 libglapi libglapi-dev \
129 libgbm libgbm-dev \
130 libgles1-mesa libgles1-mesa-dev \
131 libgles2-mesa libgles2-mesa-dev \
132 libgles3-mesa libgles3-mesa-dev \
133 libwayland-egl libwayland-egl-dev \
134 libxatracker libxatracker-dev \
135 mesa-megadriver mesa-vulkan-drivers \
136 "
137
138do_install_append () {
139 # Drivers never need libtool .la files
140 rm -f ${D}${libdir}/dri/*.la
141 rm -f ${D}${libdir}/egl/*.la
142 rm -f ${D}${libdir}/gallium-pipe/*.la
143 rm -f ${D}${libdir}/gbm/*.la
144
145 # it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used
146 rm -f ${D}${sysconfdir}/drirc
147 chrpath --delete ${D}${libdir}/dri/*_dri.so || true
148}
149
150# For the packages that make up the OpenGL interfaces, inject variables so that
151# they don't get Debian-renamed (which would remove the -mesa suffix), and
152# RPROVIDEs/RCONFLICTs on the generic libgl name.
153python __anonymous() {
154 pkgconfig = (d.getVar('PACKAGECONFIG') or "").split()
155 for p in (("egl", "libegl", "libegl1"),
156 ("dri", "libgl", "libgl1"),
157 ("gles", "libgles1", "libglesv1-cm1"),
158 ("gles", "libgles2", "libglesv2-2"),
159 ("gles", "libgles3",)):
160 if not p[0] in pkgconfig:
161 continue
162 fullp = p[1] + "-mesa"
163 pkgs = " ".join(p[1:])
164 d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
165 d.appendVar("RREPLACES_" + fullp, pkgs)
166 d.appendVar("RPROVIDES_" + fullp, pkgs)
167 d.appendVar("RCONFLICTS_" + fullp, pkgs)
168
169 d.appendVar("RRECOMMENDS_" + fullp, " mesa-megadriver")
170
171 # For -dev, the first element is both the Debian and original name
172 fullp += "-dev"
173 pkgs = p[1] + "-dev"
174 d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
175 d.appendVar("RREPLACES_" + fullp, pkgs)
176 d.appendVar("RPROVIDES_" + fullp, pkgs)
177 d.appendVar("RCONFLICTS_" + fullp, pkgs)
178}
179
180python mesa_populate_packages() {
181 pkgs = ['mesa', 'mesa-dev', 'mesa-dbg']
182 for pkg in pkgs:
183 d.setVar("RPROVIDES_%s" % pkg, pkg.replace("mesa", "mesa-dri", 1))
184 d.setVar("RCONFLICTS_%s" % pkg, pkg.replace("mesa", "mesa-dri", 1))
185 d.setVar("RREPLACES_%s" % pkg, pkg.replace("mesa", "mesa-dri", 1))
186
187 import re
188 dri_drivers_root = oe.path.join(d.getVar('PKGD'), d.getVar('libdir'), "dri")
189 if os.path.isdir(dri_drivers_root):
190 dri_pkgs = os.listdir(dri_drivers_root)
191 lib_name = d.expand("${MLPREFIX}mesa-megadriver")
192 for p in dri_pkgs:
193 m = re.match('^(.*)_dri\.so$', p)
194 if m:
195 pkg_name = " ${MLPREFIX}mesa-driver-%s" % legitimize_package_name(m.group(1))
196 d.appendVar("RPROVIDES_%s" % lib_name, pkg_name)
197 d.appendVar("RCONFLICTS_%s" % lib_name, pkg_name)
198 d.appendVar("RREPLACES_%s" % lib_name, pkg_name)
199
200 pipe_drivers_root = os.path.join(d.getVar('libdir'), "gallium-pipe")
201 do_split_packages(d, pipe_drivers_root, '^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='')
202}
203
204PACKAGESPLITFUNCS_prepend = "mesa_populate_packages "
205
206PACKAGES_DYNAMIC += "^mesa-driver-.*"
207
208FILES_${PN} += "${sysconfdir}/drirc"
209FILES_mesa-megadriver = "${libdir}/dri/*"
210FILES_mesa-vulkan-drivers = "${libdir}/libvulkan_*.so ${datadir}/vulkan"
211FILES_libegl-mesa = "${libdir}/libEGL.so.*"
212FILES_libgbm = "${libdir}/libgbm.so.*"
213FILES_libgles1-mesa = "${libdir}/libGLESv1*.so.*"
214FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*"
215FILES_libgl-mesa = "${libdir}/libGL.so.*"
216FILES_libglapi = "${libdir}/libglapi.so.*"
217FILES_libosmesa = "${libdir}/libOSMesa.so.*"
218FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*"
219FILES_libxatracker = "${libdir}/libxatracker.so.*"
220
221FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan"
222FILES_libegl-mesa-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc"
223FILES_libgbm-dev = "${libdir}/libgbm.* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h"
224FILES_libgl-mesa-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc"
225FILES_libglapi-dev = "${libdir}/libglapi.*"
226FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc"
227FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc"
228FILES_libgles3-mesa-dev = "${includedir}/GLES3"
229FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc"
230FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc ${libdir}/libwayland-egl.*"
231FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \
232 ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \
233 ${libdir}/pkgconfig/xatracker.pc"
diff --git a/meta-intel-extras/recipes/mesa/mesa_18.1.9.bb b/meta-intel-extras/recipes/mesa/mesa_18.1.9.bb
deleted file mode 100644
index 86d6a6b..0000000
--- a/meta-intel-extras/recipes/mesa/mesa_18.1.9.bb
+++ /dev/null
@@ -1,21 +0,0 @@
1require ${BPN}.inc
2
3SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
4 file://0001-Simplify-wayland-scanner-lookup.patch \
5 file://0002-winsys-svga-drm-Include-sys-types.h.patch \
6 file://0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch \
7 file://0004-Use-Python-3-to-execute-the-scripts.patch \
8 file://0005-dri-i965-Add-missing-time.h-include.patch \
9 file://0006-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch \
10"
11
12SRC_URI[md5sum] = "2f8d2098ab478bc3907e42130577b54a"
13SRC_URI[sha256sum] = "55f5778d58a710a63d6635f000535768faf7db9e8144dc0f4fd1989f936c1a83"
14
15#because we cannot rely on the fact that all apps will use pkgconfig,
16#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
17do_install_append() {
18 if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
19 sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)$/#if defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
20 fi
21}
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/classes/image_type_tezi_thud.bbclass b/meta-toradex-extras/classes/image_type_tezi_thud.bbclass
new file mode 100644
index 0000000..22af071
--- /dev/null
+++ b/meta-toradex-extras/classes/image_type_tezi_thud.bbclass
@@ -0,0 +1,250 @@
1inherit image_types
2
3do_image_teziimg[depends] += "tezi-metadata:do_deploy virtual/bootloader:do_deploy"
4
5TEZI_ROOT_FSTYPE ??= "ext4"
6UBOOT_BINARY ??= "u-boot.${UBOOT_SUFFIX}"
7UBOOT_BINARY_TEZI = "${UBOOT_BINARY}"
8UBOOT_BINARY_TEZI_apalis-t30 = "apalis_t30.img"
9UBOOT_BINARY_TEZI_apalis-tk1 = "apalis-tk1.img"
10UBOOT_BINARY_TEZI_apalis-tk1-mainline = "apalis-tk1.img"
11UBOOT_ENV_TEZI = "uEnv.txt"
12
13def rootfs_get_size(d):
14 import subprocess
15
16 # Calculate size of rootfs in kilobytes...
17 output = subprocess.check_output(['du', '-ks',
18 d.getVar('IMAGE_ROOTFS', True)])
19 return int(output.split()[0])
20
21def rootfs_tezi_emmc(d):
22 import subprocess
23 from collections import OrderedDict
24 deploydir = d.getVar('DEPLOY_DIR_IMAGE', True)
25 kernel = d.getVar('KERNEL_IMAGETYPE', True)
26 offset_bootrom = d.getVar('OFFSET_BOOTROM_PAYLOAD', True)
27 offset_spl = d.getVar('OFFSET_SPL_PAYLOAD', True)
28 imagename = d.getVar('IMAGE_NAME', True)
29 imagename_suffix = d.getVar('IMAGE_NAME_SUFFIX', True)
30
31 # Calculate size of bootfs...
32 bootfiles = [ os.path.join(deploydir, kernel) ]
33 has_devicetree = d.getVar('KERNEL_DEVICETREE', True)
34 if has_devicetree:
35 for dtb in d.getVar('KERNEL_DEVICETREE', True).split():
36 bootfiles.append(os.path.join(deploydir, dtb))
37
38 args = ['du', '-kLc']
39 args.extend(bootfiles)
40 output = subprocess.check_output(args)
41 bootfssize_kb = int(output.splitlines()[-1].split()[0])
42
43 bootpart_rawfiles = []
44
45 has_spl = d.getVar('SPL_BINARY', True)
46 if has_spl:
47 bootpart_rawfiles.append(
48 {
49 "filename": d.getVar('SPL_BINARY', True),
50 "dd_options": "seek=" + offset_bootrom
51 })
52 bootpart_rawfiles.append(
53 {
54 "filename": d.getVar('UBOOT_BINARY_TEZI', True),
55 "dd_options": "seek=" + (offset_spl if has_spl else offset_bootrom)
56 })
57
58 return [
59 OrderedDict({
60 "name": "mmcblk0",
61 "partitions": [
62 {
63 "partition_size_nominal": 16,
64 "want_maximised": False,
65 "content": {
66 "label": "BOOT",
67 "filesystem_type": "FAT",
68 "mkfs_options": "",
69 "filename": imagename + ".bootfs.tar.xz",
70 "uncompressed_size": bootfssize_kb / 1024
71 }
72 },
73 {
74 "partition_size_nominal": 512,
75 "want_maximised": True,
76 "content": {
77 "label": "RFS",
78 "filesystem_type": d.getVar('TEZI_ROOT_FSTYPE', True),
79 "mkfs_options": "-E nodiscard",
80 "filename": imagename + imagename_suffix + ".tar.xz",
81 "uncompressed_size": rootfs_get_size(d) / 1024
82 }
83 }
84 ]
85 }),
86 OrderedDict({
87 "name": "mmcblk0boot0",
88 "content": {
89 "filesystem_type": "raw",
90 "rawfiles": bootpart_rawfiles
91 }
92 })]
93
94
95def rootfs_tezi_rawnand(d):
96 from collections import OrderedDict
97 imagename = d.getVar('IMAGE_NAME', True)
98 imagename_suffix = d.getVar('IMAGE_NAME_SUFFIX', True)
99
100 # Use device tree mapping to create product id <-> device tree relationship
101 dtmapping = d.getVarFlags('TORADEX_PRODUCT_IDS')
102 dtfiles = []
103 for f, v in dtmapping.items():
104 dtfiles.append({ "filename": v, "product_ids": f })
105
106 return [
107 OrderedDict({
108 "name": "u-boot1",
109 "content": {
110 "rawfile": {
111 "filename": d.getVar('UBOOT_BINARY_TEZI', True),
112 "size": 1
113 }
114 },
115 }),
116 OrderedDict({
117 "name": "u-boot2",
118 "content": {
119 "rawfile": {
120 "filename": d.getVar('UBOOT_BINARY_TEZI', True),
121 "size": 1
122 }
123 }
124 }),
125 OrderedDict({
126 "name": "ubi",
127 "ubivolumes": [
128 {
129 "name": "kernel",
130 "size_kib": 8192,
131 "type": "static",
132 "content": {
133 "rawfile": {
134 "filename": d.getVar('KERNEL_IMAGETYPE', True),
135 "size": 5
136 }
137 }
138 },
139 {
140 "name": "dtb",
141 "content": {
142 "rawfiles": dtfiles
143 },
144 "size_kib": 128,
145 "type": "static"
146 },
147 {
148 "name": "m4firmware",
149 "size_kib": 896,
150 "type": "static"
151 },
152 {
153 "name": "rootfs",
154 "content": {
155 "filesystem_type": "ubifs",
156 "filename": imagename + imagename_suffix + ".tar.xz",
157 "uncompressed_size": rootfs_get_size(d) / 1024
158 }
159 }
160 ]
161 })]
162
163python rootfs_tezi_json() {
164 import json
165 from collections import OrderedDict
166 from datetime import datetime
167
168 deploydir = d.getVar('DEPLOY_DIR_IMAGE', True)
169 # patched in IMAGE_CMD_teziimg() below
170 release_date = "%release_date%"
171
172 data = OrderedDict({ "config_format": 2, "autoinstall": False })
173
174 # Use image recipes SUMMARY/DESCRIPTION/PV...
175 data["name"] = d.getVar('SUMMARY', True)
176 data["description"] = d.getVar('DESCRIPTION', True)
177 data["version"] = d.getVar('PV', True)
178 data["release_date"] = release_date
179 data["u_boot_env"] = d.getVar('UBOOT_ENV_TEZI', True)
180 if os.path.exists(os.path.join(deploydir, "prepare.sh")):
181 data["prepare_script"] = "prepare.sh"
182 if os.path.exists(os.path.join(deploydir, "wrapup.sh")):
183 data["wrapup_script"] = "wrapup.sh"
184 if os.path.exists(os.path.join(deploydir, "marketing.tar")):
185 data["marketing"] = "marketing.tar"
186 if os.path.exists(os.path.join(deploydir, "toradexlinux.png")):
187 data["icon"] = "toradexlinux.png"
188
189 product_ids = d.getVar('TORADEX_PRODUCT_IDS', True)
190 if product_ids is None:
191 bb.fatal("Supported Toradex product ids missing, assign TORADEX_PRODUCT_IDS with a list of product ids.")
192
193 data["supported_product_ids"] = d.getVar('TORADEX_PRODUCT_IDS', True).split()
194
195 if bb.utils.contains("TORADEX_FLASH_TYPE", "rawnand", True, False, d):
196 data["mtddevs"] = rootfs_tezi_rawnand(d)
197 else:
198 data["blockdevs"] = rootfs_tezi_emmc(d)
199
200 deploy_dir = d.getVar('DEPLOY_DIR_IMAGE', True)
201 with open(os.path.join(deploy_dir, 'image.json'), 'w') as outfile:
202 json.dump(data, outfile, indent=4)
203 bb.note("Toradex Easy Installer metadata file image.json written.")
204}
205
206do_image_teziimg[prefuncs] += "rootfs_tezi_json"
207
208IMAGE_CMD_teziimg () {
209 bbnote "Create bootfs tarball"
210
211 # Fixup release_date in image.json, convert ${DATE} to isoformat
212 # This works around the non fatal ERRORS: "the basehash value changed" when DATE is referenced
213 # in a python prefunction to do_image
214 ISODATE=`echo ${DATE} | sed 's/\(....\)\(..\)\(..\)/\1-\2-\3/'`
215 sed -i "s/%release_date%/$ISODATE/" ${DEPLOY_DIR_IMAGE}/image.json
216
217 # Create list of device tree files
218 if test -n "${KERNEL_DEVICETREE}"; then
219 for DTS_FILE in ${KERNEL_DEVICETREE}; do
220 DTS_BASE_NAME=`basename ${DTS_FILE} .dtb`
221 if [ -e "${DEPLOY_DIR_IMAGE}/${DTS_BASE_NAME}.dtb" ]; then
222 KERNEL_DEVICETREE_FILES="${KERNEL_DEVICETREE_FILES} ${DTS_BASE_NAME}.dtb"
223 else
224 bbfatal "${DTS_FILE} does not exist."
225 fi
226 done
227 fi
228
229 cd ${DEPLOY_DIR_IMAGE}
230
231 case "${TORADEX_FLASH_TYPE}" in
232 rawnand)
233 # The first transform strips all folders from the files to tar, the
234 # second transform "moves" them in a subfolder ${IMAGE_NAME}_${PV}.
235 # The third transform removes zImage from the device tree.
236 ${IMAGE_CMD_TAR} --transform='s/.*\///' --transform 's,^,${IMAGE_NAME}-Tezi_${PV}/,' -chf ${IMGDEPLOYDIR}/${IMAGE_NAME}-Tezi_${PV}${TDX_VERDATE}.tar image.json toradexlinux.png marketing.tar prepare.sh wrapup.sh ${SPL_BINARY} ${UBOOT_BINARY_TEZI} ${UBOOT_ENV_TEZI} ${KERNEL_IMAGETYPE} ${KERNEL_DEVICETREE_FILES} ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.tar.xz
237 ;;
238 *)
239 # Create bootfs...
240 ${IMAGE_CMD_TAR} --transform="flags=r;s|${KERNEL_IMAGETYPE}-||" -chf ${IMGDEPLOYDIR}/${IMAGE_NAME}.bootfs.tar -C ${DEPLOY_DIR_IMAGE} ${KERNEL_IMAGETYPE} ${KERNEL_DEVICETREE_FILES}
241 xz -f -k -c ${XZ_COMPRESSION_LEVEL} ${XZ_THREADS} --check=${XZ_INTEGRITY_CHECK} ${IMGDEPLOYDIR}/${IMAGE_NAME}.bootfs.tar > ${IMGDEPLOYDIR}/${IMAGE_NAME}.bootfs.tar.xz
242
243 # The first transform strips all folders from the files to tar, the
244 # second transform "moves" them in a subfolder ${IMAGE_NAME}-Tezi_${PV}.
245 ${IMAGE_CMD_TAR} --transform='s/.*\///' --transform 's,^,${IMAGE_NAME}-Tezi_${PV}/,' -chf ${IMGDEPLOYDIR}/${IMAGE_NAME}-Tezi_${PV}${TDX_VERDATE}.tar image.json toradexlinux.png marketing.tar prepare.sh wrapup.sh ${SPL_BINARY} ${UBOOT_BINARY_TEZI} ${UBOOT_ENV_TEZI} ${IMGDEPLOYDIR}/${IMAGE_NAME}.bootfs.tar.xz ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.tar.xz
246 ;;
247 esac
248}
249
250IMAGE_TYPEDEP_teziimg += "tar.xz"
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 ed8a94a..c467714 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -18,44 +18,44 @@
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"
29 revision="7935b6bd03aafb7e238e623bdca832d1437b923a" 29 revision="7fe6320da2cb4abec0512ca57e4177ca8de897d6"
30 path="sources/meta-qt5"/> 30 path="sources/meta-qt5"/>
31 <project name="meta-mingw" 31 <project name="meta-mingw"
32 remote="qtyocto" 32 remote="qtyocto"
33 revision="628dcfed62ce8dcc408e5b4a5e5c0aaa921b20ad" 33 revision="fa4ea76d93c87a2ad3ce88b052c282106b2761e4"
34 path="sources/meta-mingw"/> 34 path="sources/meta-mingw"/>
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"
52 remote="intel" 52 remote="intel"
53 revision="90af97d23fb2a56187c2fe2a3f4f4190d7cc2605" 53 revision="7ea89b9ddcdd3de1629bae1465425c8077c5aa06"
54 path="sources/meta-intel" 54 path="sources/meta-intel"
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,17 +75,17 @@
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"
87 remote="boundary" 87 remote="boundary"
88 revision="412ef0b92df0575808c2292cc4983e118c1a19f8" 88 revision="0533dbf42abee6e07be572eacc3d965772aad7a4"
89 path="sources/meta-boundary" 89 path="sources/meta-boundary"
90 groups="notdefault,external,boundary"/> 90 groups="notdefault,external,boundary"/>
91 <project name="meta-fsl-bsp-release" 91 <project name="meta-fsl-bsp-release"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-13 04:14:58 +0000