diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-08-13 10:05:35 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-08-29 12:44:13 +0300 |
commit | 0cf36be71217989bfcb81148f7d3fbdb44cd1e20 (patch) | |
tree | 1ff9dcc8763a8264d859dee9ca3ba87f515a6000 | |
parent | 545fe471673a4a879f719181e4502d2d0622eb2f (diff) |
yocto: upgrade to yocto 2.7.1 (warrior)
Layer updates:
poky -> warrior 2.7.1 tag
meta-openembedded -> latest in warrior branch
meta-mingw -> warrior 2.7.1 tag
meta-tegra -> latest in warrior branch
Removed & modified bbappends:
recipes-support/rng-tools/*
fixed in poky by commit
81fc280bae13c573d8b82b05ad5eb18e7882ad24 rng-tools: Fix crazy defaults
recipes-devtools/python/*
upstream patch removed by .bbappend files removed in poky by commit
e2c3247c233876ab090c9ce3d5325a6d46ab350f python3: upgrade to 3.7.2
recipes-multimedia/*, recipes-qt/images/* & other gstreamer010 related:
gstreamer0.10 recipes removed in meta-openembedded by commit
010c2f388095c1615b99d9f38a26bbd0c9e77b39 gstreamer-0.10: Remove recipes
meta-tegra-extras:
initscript overlays updated after meta-tegra commit
74af7320d37e1d53856a5225a6d6414a05adb5ec meta: unify initramfs and initrdscripts recipes
removed linux-tegra fbcon patch as it was fixed with commit
cdb1395244e38ecce26f13c6981e911f5cde5591 video: modedb: fb_videomode compare with tolerance
Change-Id: I586f7be3ba198b603bc98d72c5741d594e248c5c
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
30 files changed, 35 insertions, 286 deletions
diff --git a/meta-boot2qt-distro/conf/distro/b2qt.conf b/meta-boot2qt-distro/conf/distro/b2qt.conf index 7a70b5c1..8509aa27 100644 --- a/meta-boot2qt-distro/conf/distro/b2qt.conf +++ b/meta-boot2qt-distro/conf/distro/b2qt.conf @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -60,7 +60,6 @@ DISTRO_FEATURES_FILTER_NATIVESDK_append = " wayland" FONTCONFIG_CACHE_DIR = "${libdir}/fontconfig/cache" -# use GStreamer 1.0, optionally change to "gstreamer010" to use GStreamer 0.10 DISTRO_FEATURES += "gstreamer webengine systemd pam" VIRTUAL-RUNTIME_init_manager = "systemd" diff --git a/meta-boot2qt-distro/conf/distro/include/toradex.inc b/meta-boot2qt-distro/conf/distro/include/toradex.inc index 95a52eee..44ab7404 100644 --- a/meta-boot2qt-distro/conf/distro/include/toradex.inc +++ b/meta-boot2qt-distro/conf/distro/include/toradex.inc @@ -33,8 +33,10 @@ include conf/distro/include/fsl.inc require conf/machine/include/${MACHINE}.inc BBMASK += "\ + meta-toradex-nxp/recipes-graphics/wayland \ meta-toradex-nxp/recipes-graphics/xorg-xserver \ meta-toradex-nxp/recipes-multimedia/gstreamer \ + meta-toradex-nxp/recipes-multimedia/imx-codec \ meta-toradex-bsp-common/recipes-devtools/python \ meta-toradex-bsp-common/recipes-devtools/e2fsprogs \ meta-toradex-bsp-common/recipes-core/systemd \ @@ -52,10 +54,5 @@ IMAGE_BOOT_FILES += " \ ${MACHINE}/*;${MACHINEDIR}/ \ " -# use 1.14.0 that matches the imx version of gstreamer -PREFERRED_VERSION_gstreamer1.0-plugins-ugly = "1.14.0" -PREFERRED_VERSION_gstreamer1.0-libav = "1.14.0" - # override tezi bbclass -IMAGE_CLASSES_remove = " image_type_tezi" -IMAGE_CLASSES_append = " image_type_tezi_thud" +IMAGE_CLASSES_append = " image_type_tezi_warrior" diff --git a/meta-boot2qt-distro/conf/layer.conf b/meta-boot2qt-distro/conf/layer.conf index 4a6a22e5..eab463a1 100644 --- a/meta-boot2qt-distro/conf/layer.conf +++ b/meta-boot2qt-distro/conf/layer.conf @@ -39,4 +39,4 @@ BBFILE_COLLECTIONS += "b2qt-distro" BBFILE_PATTERN_b2qt-distro := "^${LAYERDIR}/" BBFILE_PRIORITY_b2qt-distro = "20" -LAYERSERIES_COMPAT_b2qt-distro = "thud" +LAYERSERIES_COMPAT_b2qt-distro = "warrior" diff --git a/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-gstreamer010.bb b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-gstreamer010.bb deleted file mode 100644 index 29914a70..00000000 --- a/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-gstreamer010.bb +++ /dev/null @@ -1,66 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -DESCRIPTION = "Additional gstreamer packagegroup for B2Qt embedded Linux image" -LICENSE = "The-Qt-Company-Commercial" -PR = "r0" - -inherit packagegroup - -RDEPENDS_${PN} = "\ - gst-meta-video \ - gst-meta-audio \ - gst-plugins-good \ - gst-plugins-base-app \ - gst-plugins-base-audiorate \ - gst-plugins-base-videorate \ - gst-plugins-base-encodebin \ - gst-plugins-good-videofilter \ - gst-plugins-good-id3demux \ - gst-plugins-good-auparse \ - gst-plugins-good-isomp4 \ - gst-plugins-good-icydemux \ - gst-plugins-good-video4linux2 \ - gst-plugins-good-multifile \ - gst-plugins-good-videocrop \ - gst-plugins-good-jpeg \ - gst-plugins-ugly-rmdemux \ - gst-plugins-ugly-asf \ - gst-plugins-ugly-a52dec \ - gst-plugins-bad-mpegdemux \ - gst-plugins-bad-faad \ - gst-plugins-bad-camerabin2 \ - gst-plugins-bad-jpegformat \ - gst-plugins-ugly-mad \ - gst-plugins-ugly-mpegaudioparse \ - gst-plugins-ugly-mpeg2dec \ - gst-plugins-ugly-mpegstream \ - gst-plugins-bad-mpegvideoparse \ - gst-ffmpeg \ - " diff --git a/meta-boot2qt-distro/recipes-devtools/python/python3-native_%.bbappend b/meta-boot2qt-distro/recipes-devtools/python/python3-native_%.bbappend deleted file mode 100644 index 9015f3f8..00000000 --- a/meta-boot2qt-distro/recipes-devtools/python/python3-native_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -SRC_URI_remove = "file://python-3.3-multilib.patch" diff --git a/meta-boot2qt-distro/recipes-devtools/python/python3_%.bbappend b/meta-boot2qt-distro/recipes-devtools/python/python3_%.bbappend index b3a5eb7e..57d0530a 100644 --- a/meta-boot2qt-distro/recipes-devtools/python/python3_%.bbappend +++ b/meta-boot2qt-distro/recipes-devtools/python/python3_%.bbappend @@ -1,5 +1,3 @@ -SRC_URI_remove = "file://python-3.3-multilib.patch" - # We need to install the python3 binary into the sysroot to let qtivi install that binary # into the correct location. # We can't install it directly into ${bindir} as this would be picked up by other recipes diff --git a/meta-boot2qt-distro/recipes-multimedia/alsa-utils/alsa-utils_%.bbappend b/meta-boot2qt-distro/recipes-multimedia/alsa-utils/alsa-utils_%.bbappend index ddb5c91e..0dd97d22 100644 --- a/meta-boot2qt-distro/recipes-multimedia/alsa-utils/alsa-utils_%.bbappend +++ b/meta-boot2qt-distro/recipes-multimedia/alsa-utils/alsa-utils_%.bbappend @@ -29,4 +29,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI_append_apalis-imx6 = "file://0001-Increase-default-playback-volume.patch" +SRC_URI_append_apalis-imx6 = " file://0001-Increase-default-playback-volume.patch" diff --git a/meta-boot2qt-distro/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bbappend b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bbappend deleted file mode 100644 index f42e1214..00000000 --- a/meta-boot2qt-distro/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -PACKAGECONFIG_append = " faad" diff --git a/meta-boot2qt-distro/recipes-multimedia/gstreamer/gst-plugins-base/fix-gstvolume.patch b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gst-plugins-base/fix-gstvolume.patch deleted file mode 100644 index d229e952..00000000 --- a/meta-boot2qt-distro/recipes-multimedia/gstreamer/gst-plugins-base/fix-gstvolume.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/gst/volume/gstvolume.c b/gst/volume/gstvolume.c -index 0f5b362..94d03a3 100644 ---- a/gst/volume/gstvolume.c -+++ b/gst/volume/gstvolume.c -@@ -314,10 +314,14 @@ volume_update_volume (GstVolume * self, gfloat volume, - self->current_mute = FALSE; - self->current_volume = volume; - -- self->current_vol_i8 = volume * VOLUME_UNITY_INT8; -- self->current_vol_i16 = volume * VOLUME_UNITY_INT16; -- self->current_vol_i24 = volume * VOLUME_UNITY_INT24; -- self->current_vol_i32 = volume * VOLUME_UNITY_INT32; -+ self->current_vol_i8 = -+ (gint) ((gdouble) volume * (gdouble) VOLUME_UNITY_INT8); -+ self->current_vol_i16 = -+ (gint) ((gdouble) volume * (gdouble) VOLUME_UNITY_INT16); -+ self->current_vol_i24 = -+ (gint) ((gdouble) volume * (gdouble) VOLUME_UNITY_INT24); -+ self->current_vol_i32 = -+ (gint) ((gdouble) volume * (gdouble) VOLUME_UNITY_INT32); - - passthrough = (self->current_vol_i16 == VOLUME_UNITY_INT16); - } diff --git a/meta-boot2qt-distro/recipes-multimedia/gstreamer/gst-plugins-base_0.10.%.bbappend b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gst-plugins-base_0.10.%.bbappend deleted file mode 100644 index 646faa5e..00000000 --- a/meta-boot2qt-distro/recipes-multimedia/gstreamer/gst-plugins-base_0.10.%.bbappend +++ /dev/null @@ -1,32 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://fix-gstvolume.patch" diff --git a/meta-boot2qt-distro/recipes-qt/images/b2qt-automation-qt5-image.bb b/meta-boot2qt-distro/recipes-qt/images/b2qt-automation-qt5-image.bb index 2442a39c..40a432c4 100644 --- a/meta-boot2qt-distro/recipes-qt/images/b2qt-automation-qt5-image.bb +++ b/meta-boot2qt-distro/recipes-qt/images/b2qt-automation-qt5-image.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -48,7 +48,6 @@ inherit consistent_timestamps IMAGE_INSTALL += "\ packagegroup-b2qt-embedded-base \ packagegroup-b2qt-embedded-tools \ - ${@bb.utils.contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "gstreamer", "packagegroup-b2qt-embedded-gstreamer", "", d)} \ packagegroup-b2qt-qt5-modules \ packagegroup-b2qt-embedded-addons \ diff --git a/meta-boot2qt-distro/recipes-qt/images/b2qt-automotive-qt5-image.bb b/meta-boot2qt-distro/recipes-qt/images/b2qt-automotive-qt5-image.bb index eb5232e0..83c9b8e5 100644 --- a/meta-boot2qt-distro/recipes-qt/images/b2qt-automotive-qt5-image.bb +++ b/meta-boot2qt-distro/recipes-qt/images/b2qt-automotive-qt5-image.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -48,7 +48,6 @@ inherit consistent_timestamps IMAGE_INSTALL += "\ packagegroup-b2qt-embedded-base \ packagegroup-b2qt-embedded-tools \ - ${@bb.utils.contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "gstreamer", "packagegroup-b2qt-embedded-gstreamer", "", d)} \ packagegroup-b2qt-qt5-modules \ packagegroup-b2qt-automotive-addons \ diff --git a/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-ci-image.bb b/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-ci-image.bb index 8d631669..00f5c4cc 100644 --- a/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-ci-image.bb +++ b/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-ci-image.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -44,7 +44,6 @@ inherit core-image IMAGE_INSTALL += "\ packagegroup-b2qt-embedded-base \ packagegroup-b2qt-embedded-tools \ - ${@bb.utils.contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "gstreamer", "packagegroup-b2qt-embedded-gstreamer", "", d)} \ packagegroup-b2qt-qt5-modules \ " diff --git a/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt5-image.bb b/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt5-image.bb index 1c49bc4d..afdc7dfa 100644 --- a/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt5-image.bb +++ b/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt5-image.bb @@ -48,7 +48,6 @@ inherit consistent_timestamps IMAGE_INSTALL += "\ packagegroup-b2qt-embedded-base \ packagegroup-b2qt-embedded-tools \ - ${@bb.utils.contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "gstreamer", "packagegroup-b2qt-embedded-gstreamer", "", d)} \ packagegroup-b2qt-qt5-modules \ packagegroup-b2qt-embedded-addons \ diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtmultimedia_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/qtmultimedia_git.bbappend index fbae3ba0..1595e031 100644 --- a/meta-boot2qt-distro/recipes-qt/qt5/qtmultimedia_git.bbappend +++ b/meta-boot2qt-distro/recipes-qt/qt5/qtmultimedia_git.bbappend @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -27,6 +27,4 @@ ## ############################################################################ -PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer010', 'gstreamer010', 'gstreamer', d)}" +PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio gstreamer', d)}" diff --git a/meta-boot2qt-distro/recipes-support/rng-tools/rng-tools/rngd.service b/meta-boot2qt-distro/recipes-support/rng-tools/rng-tools/rngd.service deleted file mode 100644 index 22c73612..00000000 --- a/meta-boot2qt-distro/recipes-support/rng-tools/rng-tools/rngd.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Hardware RNG Entropy Gatherer Daemon - -[Service] -ExecStart=@SBINDIR@/rngd -f -SuccessExitStatus=66 - -[Install] -WantedBy=multi-user.target diff --git a/meta-boot2qt-distro/recipes-support/rng-tools/rng-tools_5.bbappend b/meta-boot2qt-distro/recipes-support/rng-tools/rng-tools_5.bbappend deleted file mode 100644 index dba4af28..00000000 --- a/meta-boot2qt-distro/recipes-support/rng-tools/rng-tools_5.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2018 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-boot2qt/conf/layer.conf b/meta-boot2qt/conf/layer.conf index fb879754..28dbc49d 100644 --- a/meta-boot2qt/conf/layer.conf +++ b/meta-boot2qt/conf/layer.conf @@ -44,4 +44,4 @@ B2QTBASE = "${LAYERDIR}" HOSTTOOLS += "git-lfs" -LAYERSERIES_COMPAT_b2qt = "thud" +LAYERSERIES_COMPAT_b2qt = "warrior" diff --git a/meta-fsl-extras/conf/layer.conf b/meta-fsl-extras/conf/layer.conf index 74fbc942..306d569d 100644 --- a/meta-fsl-extras/conf/layer.conf +++ b/meta-fsl-extras/conf/layer.conf @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -39,8 +39,8 @@ BBFILE_COLLECTIONS += "b2qt_fsl" BBFILE_PATTERN_b2qt_fsl := "^${LAYERDIR}/" BBFILE_PRIORITY_b2qt_fsl = "20" -LAYERSERIES_COMPAT_b2qt_fsl = "thud" +LAYERSERIES_COMPAT_b2qt_fsl = "warrior" # override meta-fsl-bsp-release layers COMPATs -LAYERSERIES_COMPAT_fsl-bsp-release = "thud" -LAYERSERIES_COMPAT_fsl-sdk-release = "thud" +LAYERSERIES_COMPAT_fsl-bsp-release = "warrior" +LAYERSERIES_COMPAT_fsl-sdk-release = "warrior" diff --git a/meta-intel-extras/conf/layer.conf b/meta-intel-extras/conf/layer.conf index 038539fc..bf4e367e 100644 --- a/meta-intel-extras/conf/layer.conf +++ b/meta-intel-extras/conf/layer.conf @@ -39,4 +39,4 @@ BBFILE_COLLECTIONS += "b2qt_intel" BBFILE_PATTERN_b2qt_intel := "^${LAYERDIR}/" BBFILE_PRIORITY_b2qt_intel = "20" -LAYERSERIES_COMPAT_b2qt_intel = "thud" +LAYERSERIES_COMPAT_b2qt_intel = "warrior" diff --git a/meta-intel-extras/recipes-kernel/linux/linux-intel/b2qt.cfg b/meta-intel-extras/recipes-kernel/linux/linux-intel/b2qt.cfg index af765b53..eacb8387 100644 --- a/meta-intel-extras/recipes-kernel/linux/linux-intel/b2qt.cfg +++ b/meta-intel-extras/recipes-kernel/linux/linux-intel/b2qt.cfg @@ -1,3 +1,3 @@ CONFIG_HID_MULTITOUCH=m CONFIG_MMC_REALTEK_PCI=m -CONFIG_MFD_RTSX_PCI=m +CONFIG_MISC_RTSX_PCI=m diff --git a/meta-raspberrypi-extras/conf/layer.conf b/meta-raspberrypi-extras/conf/layer.conf index 6b2e55a2..bfb27371 100644 --- a/meta-raspberrypi-extras/conf/layer.conf +++ b/meta-raspberrypi-extras/conf/layer.conf @@ -39,4 +39,4 @@ BBFILE_COLLECTIONS += "b2qt_rpi" BBFILE_PATTERN_b2qt_rpi := "^${LAYERDIR}/" BBFILE_PRIORITY_b2qt_rpi = "20" -LAYERSERIES_COMPAT_b2qt_rpi = "thud" +LAYERSERIES_COMPAT_b2qt_rpi = "warrior" diff --git a/meta-tegra-extras/conf/layer.conf b/meta-tegra-extras/conf/layer.conf index 190f188f..85d63f92 100644 --- a/meta-tegra-extras/conf/layer.conf +++ b/meta-tegra-extras/conf/layer.conf @@ -39,4 +39,4 @@ BBFILE_COLLECTIONS += "b2qt_tegra" BBFILE_PATTERN_b2qt_tegra := "^${LAYERDIR}/" BBFILE_PRIORITY_b2qt_tegra = "20" -LAYERSERIES_COMPAT_b2qt_tegra = "thud" +LAYERSERIES_COMPAT_b2qt_tegra = "warrior" diff --git a/meta-tegra-extras/recipes-core/initscripts/tegra210-minimal-init/init-boot.sh b/meta-tegra-extras/recipes-core/initrdscripts/tegra-minimal-init/init-boot.sh index 3e43b607..3e43b607 100644 --- a/meta-tegra-extras/recipes-core/initscripts/tegra210-minimal-init/init-boot.sh +++ b/meta-tegra-extras/recipes-core/initrdscripts/tegra-minimal-init/init-boot.sh diff --git a/meta-tegra-extras/recipes-core/initscripts/tegra210-minimal-init_%.bbappend b/meta-tegra-extras/recipes-core/initrdscripts/tegra-minimal-init_1.0.bbappend index 788524a6..b3fbb8ff 100644 --- a/meta-tegra-extras/recipes-core/initscripts/tegra210-minimal-init_%.bbappend +++ b/meta-tegra-extras/recipes-core/initrdscripts/tegra-minimal-init_1.0.bbappend @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. diff --git a/meta-tegra-extras/recipes-kernel/linux/linux-tegra/0001-fbcon-Compare-variable-screen-info-instead-of-modes-.patch b/meta-tegra-extras/recipes-kernel/linux/linux-tegra/0001-fbcon-Compare-variable-screen-info-instead-of-modes-.patch deleted file mode 100644 index dd58eeda..00000000 --- a/meta-tegra-extras/recipes-kernel/linux/linux-tegra/0001-fbcon-Compare-variable-screen-info-instead-of-modes-.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 727c2a7dd80589e99b6061f362cf5f1f4d5a84d7 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo <samuli.piippo@qt.io> -Date: Mon, 8 May 2017 08:47:27 +0300 -Subject: [PATCH] fbcon: Compare variable screen info instead of modes (FIX) - -Previous commit changed behavior, so that when trying to match a mode to a -variable screen info structure, the mode was first converted to a variable -screen structure rather than the variable screen info structure to a mode. - -However, when new mode was being added to the modelist, matching was still -being done using mode structure. This could cause situation, where existing -mode would match when comparing with mode structure, but not when compared -using variable screen info structure. This would eventually result in a -NULL pointer dereference in fbcon_switch. - -Fix the issue by using the variable screen info structure also when adding -new mode to the modelist. ---- - drivers/video/fbdev/core/modedb.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/drivers/video/fbdev/core/modedb.c b/drivers/video/fbdev/core/modedb.c -index f5a53a6..a8fd871 100644 ---- a/drivers/video/fbdev/core/modedb.c -+++ b/drivers/video/fbdev/core/modedb.c -@@ -2187,13 +2187,14 @@ int fb_add_videomode(const struct fb_videomode *mode, struct list_head *head) - { - struct list_head *pos; - struct fb_modelist *modelist; -- struct fb_videomode *m; -+ struct fb_var_screeninfo v1, v2; - int found = 0; - -+ fb_videomode_to_var(&v1, mode); - list_for_each(pos, head) { - modelist = list_entry(pos, struct fb_modelist, list); -- m = &modelist->mode; -- if (fb_mode_is_equal(m, mode)) { -+ fb_videomode_to_var(&v2, &modelist->mode); -+ if (fb_var_is_equal(&v1, &v2)) { - found = 1; - break; - } diff --git a/meta-tegra-extras/recipes-kernel/linux/linux-tegra_%.bbappend b/meta-tegra-extras/recipes-kernel/linux/linux-tegra_%.bbappend index 4f12d960..d44e0b28 100644 --- a/meta-tegra-extras/recipes-kernel/linux/linux-tegra_%.bbappend +++ b/meta-tegra-extras/recipes-kernel/linux/linux-tegra_%.bbappend @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -27,9 +27,4 @@ ## ############################################################################ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += "\ - file://0001-fbcon-Compare-variable-screen-info-instead-of-modes-.patch \ - " - KERNEL_ROOTSPEC = "root=/dev/mmcblk\${devnum}p1 rw rootwait" diff --git a/meta-toradex-extras/classes/image_type_tezi_thud.bbclass b/meta-toradex-extras/classes/image_type_tezi_warrior.bbclass index 22af0713..22af0713 100644 --- a/meta-toradex-extras/classes/image_type_tezi_thud.bbclass +++ b/meta-toradex-extras/classes/image_type_tezi_warrior.bbclass diff --git a/meta-toradex-extras/conf/layer.conf b/meta-toradex-extras/conf/layer.conf index ef241bec..c1c4900b 100644 --- a/meta-toradex-extras/conf/layer.conf +++ b/meta-toradex-extras/conf/layer.conf @@ -39,8 +39,8 @@ BBFILE_COLLECTIONS += "b2qt_toradex" BBFILE_PATTERN_b2qt_toradex := "^${LAYERDIR}/" BBFILE_PRIORITY_b2qt_toradex = "20" -LAYERSERIES_COMPAT_b2qt_toradex = "thud" +LAYERSERIES_COMPAT_b2qt_toradex = "warrior" # override toradex layer COMPATs -LAYERSERIES_COMPAT_toradex-bsp-common-layer = "thud" -LAYERSERIES_COMPAT_toradex-nxp-layer = "thud" +LAYERSERIES_COMPAT_toradex-bsp-common-layer = "warrior" +LAYERSERIES_COMPAT_toradex-nxp-layer = "warrior" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 749dbdb0..113ecc57 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -19,11 +19,11 @@ <project name="poky" remote="yocto" - revision="e7f0177ef3b6e06b8bc1722fca0241fef08a1530" + revision="38d5c8ea98cfa49825c473eba8984c12edf062be" path="sources/poky"/> <project name="meta-openembedded" remote="oe-mirror" - revision="9b3b907f30b0d5b92d58c7e68289184fda733d3e" + revision="8d5dcd6522e9d15e68637b6d7dda0401f9bb91d0" path="sources/meta-openembedded"/> <project name="meta-qt5" remote="qtyocto" @@ -31,32 +31,32 @@ path="sources/meta-qt5"/> <project name="meta-mingw" remote="qtyocto" - revision="fa4ea76d93c87a2ad3ce88b052c282106b2761e4" + revision="10695afe8cd406844e0d0dd868c11677e07557d4" path="sources/meta-mingw"/> <project name="meta-freescale" remote="freescale" - revision="b73854c078b0a174613135b60da3377a1055f477" + revision="deb8750093fa8c44df0871131c82284fa4edc22f" path="sources/meta-freescale" groups="notdefault,external,fsl,toradex,smx6,boundary,fsl-imx8,toradex-imx8"/> <project name="meta-freescale-3rdparty" remote="freescale" - revision="c4b5ac6b20e4245ce0630e9197313aaef999a331" + revision="da422478d38e744283bcf61123c4a526396c7030" path="sources/meta-freescale-3rdparty" groups="notdefault,external,fsl,toradex,smx6,boundary,fsl-imx8,toradex-imx8"/> <project name="meta-raspberrypi" remote="yocto" - revision="89bdf97beaf3b136c24c4d6f86c0bcbb47fe3043" + revision="c2f2eaf4451691c24f17fd28b11d228e07e911dd" path="sources/meta-raspberrypi" groups="notdefault,external,rpi"/> <project name="meta-intel" remote="intel" - revision="27dadcfc7bc0de70328b02fecb841608389d22fc" + revision="e84c763090f91196a5d234f62ee39bcf296c7f2e" path="sources/meta-intel" groups="notdefault,external,intel"/> <project name="meta-tegra" remote="madisongh" - revision="a7f117529b3e93cac4f85c642783236f298bc519" + revision="40d61e3c7aa4cfe993685bb4011e16617edc24fa" path="sources/meta-tegra" groups="notdefault,external,jetson"/> <project name="meta-renesas" @@ -76,12 +76,12 @@ groups="notdefault,external,renesas-gen3,renesas-draak"/> <project name="meta-toradex-bsp-common" remote="toradex" - revision="b3fe56eec075ccd719b0ec1fde32ad9c37f0cca0" + revision="3fa96f28bb30643cac3b8a49d3abd7c976acb704" path="sources/meta-toradex-bsp-common" groups="notdefault,external,toradex"/> <project name="meta-toradex-nxp" remote="toradex" - revision="53d4be5b9b8f609ae713e6eea8e935a73f7f7fd6" + revision="cf24e18cc50c2f0cab6b44fd3f03fa39cfca4e9f" path="sources/meta-toradex-nxp" groups="notdefault,external,toradex"/> <project name="meta-boundary" |