From 551dd571b739e2f443f70ca20f5fd3a28d61fe82 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Fri, 11 Aug 2017 13:28:28 +0300 Subject: poky: update to 2.3 (pyro) * Update poky, meta-openembedded etc. layers to pyro branches * Remove/update meta-boot2qt layer patches/recipes as needed Task-number: QTBUG-61283 Change-Id: I425609c99ef22a0cc904dd853b3bb281d32fbcad Reviewed-by: Samuli Piippo --- conf/distro/include/toradex.inc | 2 + .../recipes/u-boot/u-boot-fslc_%.bbappend | 34 ++++++++++++ .../recipes/u-boot/u-boot-fslc_2016.%.bbappend | 34 ------------ .../recipes/u-boot/u-boot-toradex_%.bbappend | 1 + ...kagegroup-b2qt-embedded-qt5-toolchain-target.bb | 1 - .../packagegroups/packagegroup-b2qt-qt5-modules.bb | 1 - recipes/ca-certificates/ca-certificates_%.bbappend | 34 ------------ recipes/fonts/ttf-opensans.bb | 5 +- recipes/gnutls/files/check_SYS_getrandom.patch | 36 ------------- recipes/gnutls/gnutls_3.%.bbappend | 32 ----------- ...dk-packagegroup-b2qt-embedded-toolchain-host.bb | 1 - .../virtualbox-guest-additions_5.1.14.bb | 62 ---------------------- .../virtualbox-guest-additions_5.1.16.bb | 62 ++++++++++++++++++++++ scripts/manifest.xml | 18 +++---- 14 files changed, 111 insertions(+), 212 deletions(-) create mode 100644 meta-fsl-extras/recipes/u-boot/u-boot-fslc_%.bbappend delete mode 100644 meta-fsl-extras/recipes/u-boot/u-boot-fslc_2016.%.bbappend delete mode 100644 recipes/ca-certificates/ca-certificates_%.bbappend delete mode 100644 recipes/gnutls/files/check_SYS_getrandom.patch delete mode 100644 recipes/gnutls/gnutls_3.%.bbappend delete mode 100644 recipes/virtualbox/virtualbox-guest-additions_5.1.14.bb create mode 100644 recipes/virtualbox/virtualbox-guest-additions_5.1.16.bb diff --git a/conf/distro/include/toradex.inc b/conf/distro/include/toradex.inc index ef395a1..86d8845 100644 --- a/conf/distro/include/toradex.inc +++ b/conf/distro/include/toradex.inc @@ -29,6 +29,8 @@ include conf/distro/include/fsl.inc +BBMASK += "meta-toradex-nxp/recipes-graphics/xorg-xserver" + PREFERRED_PROVIDER_u-boot = "u-boot-toradex" EXTRA_IMAGEDEPENDS += "u-boot u-boot-script-toradex" diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-fslc_%.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-fslc_%.bbappend new file mode 100644 index 0000000..c5201a0 --- /dev/null +++ b/meta-fsl-extras/recipes/u-boot/u-boot-fslc_%.bbappend @@ -0,0 +1,34 @@ +############################################################################ +## +## 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_append := "${THISDIR}/${PN}:" +SRC_URI += " \ + file://0001-Updated-kernel-arguments-for-sabre-sd.patch \ + file://0001-Use-hdmi-as-primary-display-only-if-connected.patch \ + " diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2016.%.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2016.%.bbappend deleted file mode 100644 index c5201a0..0000000 --- a/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2016.%.bbappend +++ /dev/null @@ -1,34 +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_append := "${THISDIR}/${PN}:" -SRC_URI += " \ - file://0001-Updated-kernel-arguments-for-sabre-sd.patch \ - file://0001-Use-hdmi-as-primary-display-only-if-connected.patch \ - " 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 7d7f373..39fc9cc 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend +++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend @@ -32,3 +32,4 @@ SRC_URI += " \ file://0001-Make-sdboot-default-on-all-boards.patch \ file://0001-apalis-imx6-enable-Fusion10-display-if-found-during-.patch \ " +DEPENDS += "dtc-native" diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb index 211ba0a..b2b8d69 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb @@ -57,7 +57,6 @@ RDEPENDS_${PN} += " \ qtlocation-dev \ qtmultimedia-dev \ qtnetworkauth-dev \ - qtotaupdate-dev \ qtquickcontrols-dev \ qtquickcontrols2-dev \ qtremoteobjects-dev \ diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb index 081d8fe..50ce015 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb @@ -49,7 +49,6 @@ RDEPENDS_${PN} += " \ qtlocation \ qtmultimedia \ qtnetworkauth \ - qtotaupdate \ qtquickcontrols \ qtquickcontrols2 \ qtremoteobjects \ diff --git a/recipes/ca-certificates/ca-certificates_%.bbappend b/recipes/ca-certificates/ca-certificates_%.bbappend deleted file mode 100644 index 210f550..0000000 --- a/recipes/ca-certificates/ca-certificates_%.bbappend +++ /dev/null @@ -1,34 +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$ -## -############################################################################ - -SRC_URI_remove = "file://0001-update-ca-certificates-remove-c-rehash.patch" -DEPENDS_class-native = "coreutils-native" - -# for c_rehash -RDEPENDS_${PN}_class-target += "openssl openssl-misc" diff --git a/recipes/fonts/ttf-opensans.bb b/recipes/fonts/ttf-opensans.bb index 08e8421..a4af90e 100644 --- a/recipes/fonts/ttf-opensans.bb +++ b/recipes/fonts/ttf-opensans.bb @@ -29,15 +29,16 @@ SUMMARY = "Open Sans Fonts" SECTION = "fonts" -HOMEPAGE = "https://www.google.com/fonts" +HOMEPAGE = "https://fonts.google.com" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE.txt;md5=d273d63619c9aeaf15cdaf76422c4f87" INHIBIT_DEFAULT_DEPS = "1" +do_unpack[depends] += "unzip-native:do_populate_sysroot" inherit allarch fontcache -SRC_URI = "https://www.google.com/fonts/download?kit=3hvsV99qyKCBS55e5pvb3ltkqrIMaAZWyLYEoB48lSQ;downloadfilename=Open_Sans.zip" +SRC_URI = "https://fonts.google.com/download?family=Open%20Sans;downloadfilename=Open_Sans.zip" # Google packs fonts package on demand which results in unpredictable md5sum, so disable checksum check BB_STRICT_CHECKSUM = "" diff --git a/recipes/gnutls/files/check_SYS_getrandom.patch b/recipes/gnutls/files/check_SYS_getrandom.patch deleted file mode 100644 index 50693bf..0000000 --- a/recipes/gnutls/files/check_SYS_getrandom.patch +++ /dev/null @@ -1,36 +0,0 @@ -From f26c3979ab0325edb2e410d287bc501cf00e0ac0 Mon Sep 17 00:00:00 2001 -From: Nikos Mavrogiannopoulos -Date: Mon, 22 Aug 2016 16:32:34 +0200 -Subject: [PATCH] rnd-linux: added check for SYS_getrandom being defined - -This allows to compile the getrandom() code in old Linux systems -which do not have the system call defined. ---- - -Upstream-Status: Backport -Signed-off-by: Khem Raj - - lib/nettle/rnd-linux.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/lib/nettle/rnd-linux.c b/lib/nettle/rnd-linux.c -index d7f07a6..7a24d05 100644 ---- a/lib/nettle/rnd-linux.c -+++ b/lib/nettle/rnd-linux.c -@@ -56,7 +56,11 @@ static dev_t _gnutls_urandom_fd_rdev = 0; - # else - # include - # undef getrandom --# define getrandom(dst,s,flags) syscall(SYS_getrandom, (void*)dst, (size_t)s, (unsigned int)flags) -+# if defined(SYS_getrandom) -+# define getrandom(dst,s,flags) syscall(SYS_getrandom, (void*)dst, (size_t)s, (unsigned int)flags) -+# else -+# define getrandom(dst,s,flags) -1 -+# endif - # endif - - static unsigned have_getrandom(void) --- -libgit2 0.24.0 - - diff --git a/recipes/gnutls/gnutls_3.%.bbappend b/recipes/gnutls/gnutls_3.%.bbappend deleted file mode 100644 index 8d91bb0..0000000 --- a/recipes/gnutls/gnutls_3.%.bbappend +++ /dev/null @@ -1,32 +0,0 @@ -############################################################################ -## -## 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$ -## -############################################################################ - -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -SRC_URI += "file://check_SYS_getrandom.patch" diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb index 9e55ca3..9f43fff 100644 --- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb +++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb @@ -57,5 +57,4 @@ RDEPENDS_${PN}_append_mingw32 = "\ nativesdk-make \ nativesdk-libgcc \ nativesdk-libstdc++ \ - nativesdk-mingw-w64-winpthreads \ " diff --git a/recipes/virtualbox/virtualbox-guest-additions_5.1.14.bb b/recipes/virtualbox/virtualbox-guest-additions_5.1.14.bb deleted file mode 100644 index 00dcaa5..0000000 --- a/recipes/virtualbox/virtualbox-guest-additions_5.1.14.bb +++ /dev/null @@ -1,62 +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 = "Kernel drivers for the VirtualBox guest additions" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${WORKDIR}/VirtualBox-${PV}/COPYING;md5=e197d5641bb35b29d46ca8c4bf7f2660" - -inherit module - -MACHINE_KERNEL_PR_append = "a" -PR = "${MACHINE_KERNEL_PR}" - -SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/VirtualBox-${PV}.tar.bz2" - -SRC_URI[md5sum] = "21eaec9f21477d555559a63761779880" -SRC_URI[sha256sum] = "8267bb026717c6e55237eb798210767d9c703cfcdf01224d9bc26f7dac9f228a" - -S = "${WORKDIR}/vbox" - -export KERN_DIR="${STAGING_KERNEL_DIR}" -export KBUILD_VERBOSE="1" -export BUILD_TARGET_ARCH="${ARCH}" - -do_compile_prepend() { - ${WORKDIR}/VirtualBox-${PV}/src/VBox/Additions/linux/export_modules ${WORKDIR}/vbox.tar.gz - tar xf ${WORKDIR}/vbox.tar.gz -C ${WORKDIR}/vbox -} - -do_install() { - install -m 0755 -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/vbox - install -m 0644 vboxsf.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/vbox - install -m 0644 vboxguest.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/vbox - install -m 0644 vboxvideo.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/vbox -} - -PKG_${PN} = "kernel-module-vbox" diff --git a/recipes/virtualbox/virtualbox-guest-additions_5.1.16.bb b/recipes/virtualbox/virtualbox-guest-additions_5.1.16.bb new file mode 100644 index 0000000..752d8cb --- /dev/null +++ b/recipes/virtualbox/virtualbox-guest-additions_5.1.16.bb @@ -0,0 +1,62 @@ +############################################################################ +## +## 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$ +## +############################################################################ + +DESCRIPTION = "Kernel drivers for the VirtualBox guest additions" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://${WORKDIR}/VirtualBox-${PV}/COPYING;md5=e197d5641bb35b29d46ca8c4bf7f2660" + +inherit module + +MACHINE_KERNEL_PR_append = "a" +PR = "${MACHINE_KERNEL_PR}" + +SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/VirtualBox-${PV}.tar.bz2" + +SRC_URI[md5sum] = "37ebbd51370841eed8ab80f2f38446d6" +SRC_URI[sha256sum] = "78071c3172f3bd3c7981c352c3ae6c6a9c01f6ab24bc0aa7ec79f3528b2291a7" + +S = "${WORKDIR}/vbox" + +export KERN_DIR="${STAGING_KERNEL_DIR}" +export KBUILD_VERBOSE="1" +export BUILD_TARGET_ARCH="${ARCH}" + +do_compile_prepend() { + ${WORKDIR}/VirtualBox-${PV}/src/VBox/Additions/linux/export_modules ${WORKDIR}/vbox.tar.gz + tar xf ${WORKDIR}/vbox.tar.gz -C ${WORKDIR}/vbox +} + +do_install() { + install -m 0755 -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/vbox + install -m 0644 vboxsf.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/vbox + install -m 0644 vboxguest.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/vbox + install -m 0644 vboxvideo.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/vbox +} + +PKG_${PN} = "kernel-module-vbox" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index e7e6624..95209bf 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -16,29 +16,29 @@