From 63d391f0d1002c34ce9430b4e40f3afd8225c1fa Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 16 Oct 2017 10:05:18 +0300 Subject: Fix for the broken gdb in windows toolchain Needs updated meta-mingw layer. Task-number: QTBUG-63801 Change-Id: I2c390649d7c8e22d382b5eaa311fac620a04cbb6 Reviewed-by: Mikko Gronoff --- recipes/gdb/gdb-cross-canadian_7.%.bbappend | 2 +- scripts/manifest.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/gdb/gdb-cross-canadian_7.%.bbappend b/recipes/gdb/gdb-cross-canadian_7.%.bbappend index 9e3c296..452753d 100644 --- a/recipes/gdb/gdb-cross-canadian_7.%.bbappend +++ b/recipes/gdb/gdb-cross-canadian_7.%.bbappend @@ -29,7 +29,7 @@ DEPENDS_append_sdkmingw32 = " nativesdk-prebuild-python" RDEPENDS_${PN}_append_sdkmingw32 = " nativesdk-prebuild-python" -EXTRA_OECONF_remove_sdkmingw32 = " --without-python" +EXTRA_OECONF_remove_sdkmingw32 = "--without-python --with-python=no" EXTRA_OECONF_append_sdkmingw32 = " --with-python" do_install_append_sdkmingw32() { diff --git a/scripts/manifest.xml b/scripts/manifest.xml index eb1f22f..9f7d442 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -29,7 +29,7 @@ + revision="4a621def8529c3a55c6fcaef72e3b1832a9327b3"/> Date: Wed, 18 Oct 2017 13:25:50 +0300 Subject: apalis-imx6: lower default resolution on HDMI to 720p imx6 does not have enough power to run qtlauncher smootly in fullHD resolution. Change-Id: I8c66e676ce65cb5b50e8894e28e0d574d18ca90f Reviewed-by: Sami Nurmenniemi Reviewed-by: Kari Hormi --- ...-lower-default-resolution-on-HDMI-to-720p.patch | 22 ++++++++++++++++++++++ .../recipes/u-boot/u-boot-toradex_%.bbappend | 1 + 2 files changed, 23 insertions(+) create mode 100644 meta-fsl-extras/recipes/u-boot/u-boot-toradex/0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch new file mode 100644 index 0000000..c259f7f --- /dev/null +++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch @@ -0,0 +1,22 @@ +From 0b31b8e73bfbc02e7687ea521e9e92f892e7052a Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Wed, 18 Oct 2017 13:20:25 +0300 +Subject: [PATCH 4/4] apalis-imx6: lower default resolution on HDMI to 720p + +--- + include/configs/apalis_imx6.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h +index 77a8874..0292e74 100644 +--- a/include/configs/apalis_imx6.h ++++ b/include/configs/apalis_imx6.h +@@ -295,7 +295,7 @@ + "source ${loadaddr}\0" \ + "splashpos=m,m\0" \ + "vidargs=mxc_hdmi.only_cea=1 " \ +- "video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24 " \ ++ "video=mxcfb0:dev=hdmi,1280x720M@60,if=RGB24 " \ + "video=mxcfb1:off video=mxcfb2:off video=mxcfb3:off " \ + "fbmem=32M\0 " + diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend index 78e32d3..b1826db 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend +++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend @@ -32,4 +32,5 @@ SRC_URI += " \ file://0001-Make-sdboot-default-on-all-boards.patch \ file://0002-apalis-imx6-test-for-Capacitive-Touch-Display-7-Para.patch \ file://0003-apalis-imx6-Ixora-v1.0-support.patch \ + file://0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch \ " -- cgit v1.2.3-54-g00ecf From e084dffbd643f65f03b33fd4485d3f98435bc7c0 Mon Sep 17 00:00:00 2001 From: Kari Oikarinen Date: Wed, 1 Nov 2017 13:41:11 +0200 Subject: Add qdbd to automotive images Automotive suite 2.0 will need it. Task-number: AUTOSUITE-123 Change-Id: I07eed62ee9ae40225e6de7ccac07383a0f1ab62f Reviewed-by: Mikko Gronoff --- recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb index be15207..bb2e4de 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb @@ -43,4 +43,5 @@ RDEPENDS_${PN} += " \ gammaray \ qmllive-target \ multiscreen-demo \ + qdbd \ " -- cgit v1.2.3-54-g00ecf From 563f0dc52d87742b64729f70e5881b02b2f9db50 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 2 Nov 2017 10:56:11 +0200 Subject: otf-noto: get files from the git repo The checksum of the zip file changes too often, which always breaks the build. Change to using the git repo for the files. Unfortunately the repo is massive (>1Gb), but at least it should not cause build breaks anymore. Task-number: QTBUG-64231 Change-Id: Iddfe71c8189caf4e66d78c46e9ca9410b333a8dd Reviewed-by: Mikko Gronoff --- recipes/fonts/otf-noto.bb | 54 ------------------------------------------- recipes/fonts/otf-noto_git.bb | 53 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 54 deletions(-) delete mode 100644 recipes/fonts/otf-noto.bb create mode 100644 recipes/fonts/otf-noto_git.bb diff --git a/recipes/fonts/otf-noto.bb b/recipes/fonts/otf-noto.bb deleted file mode 100644 index 1c17d33..0000000 --- a/recipes/fonts/otf-noto.bb +++ /dev/null @@ -1,54 +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$ -## -############################################################################ - -SUMMARY = "Noto Sans CJK" -SECTION = "fonts" -HOMEPAGE = "http://www.google.com/get/noto" -LICENSE = "OFL-1.1" -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE_OFL.txt;md5=55719faa0112708e946b820b24b14097" - -INHIBIT_DEFAULT_DEPS = "1" - -inherit allarch fontcache - -PV = "1.004" -SRC_URI = "https://noto-website-2.storage.googleapis.com/pkgs/NotoSansCJKsc-hinted.zip" - -SRC_URI[md5sum] = "539a04d2a14a12096897f84ba046d110" -SRC_URI[sha256sum] = "c0a77b24ce1964c5d244be7576ada5899d681638e0abd0917e6a661df56e0232" - -S = "${WORKDIR}" - -do_install() { - install -m 0755 -d ${D}${datadir}/fonts/otf/noto - install -m 0644 ${WORKDIR}/*.otf ${D}${datadir}/fonts/otf/noto -} - -PACKAGES = "${PN}" -FILES_${PN} += "${datadir}/fonts/otf/noto" diff --git a/recipes/fonts/otf-noto_git.bb b/recipes/fonts/otf-noto_git.bb new file mode 100644 index 0000000..3be53c2 --- /dev/null +++ b/recipes/fonts/otf-noto_git.bb @@ -0,0 +1,53 @@ +############################################################################ +## +## Copyright (C) 2017 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$ +## +############################################################################ + +SUMMARY = "Noto Sans CJK" +SECTION = "fonts" +HOMEPAGE = "http://www.google.com/get/noto" +LICENSE = "OFL-1.1" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=55719faa0112708e946b820b24b14097" + +INHIBIT_DEFAULT_DEPS = "1" + +inherit allarch fontcache + +PV = "1.004" +SRC_URI = "git://github.com/googlei18n/noto-cjk.git" +SRCREV = "40d9f5b179a59a06b98373c76bdc3e2119e4e6b2" + +S = "${WORKDIR}/git" + +do_install() { + install -m 0755 -d ${D}${datadir}/fonts/otf/noto + install -m 0644 ${S}/NotoSansCJKsc-*.otf ${D}${datadir}/fonts/otf/noto + install -m 0644 ${S}/NotoSansMonoCJKsc-*.otf ${D}${datadir}/fonts/otf/noto +} + +PACKAGES = "${PN}" +FILES_${PN} += "${datadir}/fonts/otf/noto" -- cgit v1.2.3-54-g00ecf From ce7ca19e5f7c909429ac246d6623ce7c5d9eeb6e Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Fri, 3 Nov 2017 14:29:39 +0200 Subject: meta-qt5: update layer Update submodules to first Qt 5.9.3 snapshot Change-Id: I3f4191b00e3357c720c4f03f0a820d45cd3e2214 Reviewed-by: Samuli Piippo --- scripts/manifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 9f7d442..72ed7b5 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -24,7 +24,7 @@ path="sources/meta-openembedded"/> Date: Mon, 6 Nov 2017 08:52:39 +0200 Subject: poky: update to latest revision in morty branch Pulls in latest morty branch fixes & improvements, most important one being the fix to WPA2 key replay security issue. Task-number: QTBUG-64216 Change-Id: Id86a7c4ac4e057b9157b00d389655061d6154ab9 Reviewed-by: Samuli Piippo --- scripts/manifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 72ed7b5..93c03a5 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -16,7 +16,7 @@ Date: Mon, 6 Nov 2017 16:30:10 +0200 Subject: tegra: correctly append to DEPENDS Cannot use += together with _class-target override. Change-Id: I6f67f1b5eb972264cb9242b91266b5b8329d9ee2 Reviewed-by: Mikko Gronoff --- meta-nvidia-extras/recipes/wayland/wayland_%.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-nvidia-extras/recipes/wayland/wayland_%.bbappend b/meta-nvidia-extras/recipes/wayland/wayland_%.bbappend index 5ab7634..f05607c 100644 --- a/meta-nvidia-extras/recipes/wayland/wayland_%.bbappend +++ b/meta-nvidia-extras/recipes/wayland/wayland_%.bbappend @@ -31,4 +31,4 @@ FILESEXTRAPATHS_append := ":${LNX_TOPDIR}_src/wayland" SRC_URI = "file://wayland-1.11.0-src.tar.gz" -DEPENDS_class-target += "wayland-egl" +DEPENDS_append_class-target = " wayland-egl" -- cgit v1.2.3-54-g00ecf