diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-08-11 13:28:28 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-08-17 06:45:20 +0000 |
commit | 551dd571b739e2f443f70ca20f5fd3a28d61fe82 (patch) | |
tree | 3d0a24353a816363832156ce7cfda440516dc7d6 | |
parent | 2b70147f1e353e22bd989915de8bac584fa8ce9f (diff) | |
download | meta-boot2qt-551dd571b739e2f443f70ca20f5fd3a28d61fe82.tar.gz |
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 <samuli.piippo@qt.io>
-rw-r--r-- | conf/distro/include/toradex.inc | 2 | ||||
-rw-r--r-- | meta-fsl-extras/recipes/u-boot/u-boot-fslc_%.bbappend (renamed from meta-fsl-extras/recipes/u-boot/u-boot-fslc_2016.%.bbappend) | 0 | ||||
-rw-r--r-- | meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend | 1 | ||||
-rw-r--r-- | recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb | 1 | ||||
-rw-r--r-- | recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb | 1 | ||||
-rw-r--r-- | recipes/ca-certificates/ca-certificates_%.bbappend | 34 | ||||
-rw-r--r-- | recipes/fonts/ttf-opensans.bb | 5 | ||||
-rw-r--r-- | recipes/gnutls/files/check_SYS_getrandom.patch | 36 | ||||
-rw-r--r-- | recipes/gnutls/gnutls_3.%.bbappend | 32 | ||||
-rw-r--r-- | recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb | 1 | ||||
-rw-r--r-- | recipes/virtualbox/virtualbox-guest-additions_5.1.16.bb (renamed from recipes/virtualbox/virtualbox-guest-additions_5.1.14.bb) | 6 | ||||
-rw-r--r-- | scripts/manifest.xml | 18 |
12 files changed, 18 insertions, 119 deletions
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 @@ | |||
29 | 29 | ||
30 | include conf/distro/include/fsl.inc | 30 | include conf/distro/include/fsl.inc |
31 | 31 | ||
32 | BBMASK += "meta-toradex-nxp/recipes-graphics/xorg-xserver" | ||
33 | |||
32 | PREFERRED_PROVIDER_u-boot = "u-boot-toradex" | 34 | PREFERRED_PROVIDER_u-boot = "u-boot-toradex" |
33 | 35 | ||
34 | EXTRA_IMAGEDEPENDS += "u-boot u-boot-script-toradex" | 36 | EXTRA_IMAGEDEPENDS += "u-boot u-boot-script-toradex" |
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2016.%.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-fslc_%.bbappend index c5201a0..c5201a0 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2016.%.bbappend +++ b/meta-fsl-extras/recipes/u-boot/u-boot-fslc_%.bbappend | |||
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 += " \ | |||
32 | file://0001-Make-sdboot-default-on-all-boards.patch \ | 32 | file://0001-Make-sdboot-default-on-all-boards.patch \ |
33 | file://0001-apalis-imx6-enable-Fusion10-display-if-found-during-.patch \ | 33 | file://0001-apalis-imx6-enable-Fusion10-display-if-found-during-.patch \ |
34 | " | 34 | " |
35 | 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} += " \ | |||
57 | qtlocation-dev \ | 57 | qtlocation-dev \ |
58 | qtmultimedia-dev \ | 58 | qtmultimedia-dev \ |
59 | qtnetworkauth-dev \ | 59 | qtnetworkauth-dev \ |
60 | qtotaupdate-dev \ | ||
61 | qtquickcontrols-dev \ | 60 | qtquickcontrols-dev \ |
62 | qtquickcontrols2-dev \ | 61 | qtquickcontrols2-dev \ |
63 | qtremoteobjects-dev \ | 62 | 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} += " \ | |||
49 | qtlocation \ | 49 | qtlocation \ |
50 | qtmultimedia \ | 50 | qtmultimedia \ |
51 | qtnetworkauth \ | 51 | qtnetworkauth \ |
52 | qtotaupdate \ | ||
53 | qtquickcontrols \ | 52 | qtquickcontrols \ |
54 | qtquickcontrols2 \ | 53 | qtquickcontrols2 \ |
55 | qtremoteobjects \ | 54 | 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 @@ | |||
1 | ############################################################################ | ||
2 | ## | ||
3 | ## Copyright (C) 2016 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 | |||
30 | SRC_URI_remove = "file://0001-update-ca-certificates-remove-c-rehash.patch" | ||
31 | DEPENDS_class-native = "coreutils-native" | ||
32 | |||
33 | # for c_rehash | ||
34 | 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 @@ | |||
29 | 29 | ||
30 | SUMMARY = "Open Sans Fonts" | 30 | SUMMARY = "Open Sans Fonts" |
31 | SECTION = "fonts" | 31 | SECTION = "fonts" |
32 | HOMEPAGE = "https://www.google.com/fonts" | 32 | HOMEPAGE = "https://fonts.google.com" |
33 | LICENSE = "Apache-2.0" | 33 | LICENSE = "Apache-2.0" |
34 | LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE.txt;md5=d273d63619c9aeaf15cdaf76422c4f87" | 34 | LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE.txt;md5=d273d63619c9aeaf15cdaf76422c4f87" |
35 | 35 | ||
36 | INHIBIT_DEFAULT_DEPS = "1" | 36 | INHIBIT_DEFAULT_DEPS = "1" |
37 | do_unpack[depends] += "unzip-native:do_populate_sysroot" | ||
37 | 38 | ||
38 | inherit allarch fontcache | 39 | inherit allarch fontcache |
39 | 40 | ||
40 | SRC_URI = "https://www.google.com/fonts/download?kit=3hvsV99qyKCBS55e5pvb3ltkqrIMaAZWyLYEoB48lSQ;downloadfilename=Open_Sans.zip" | 41 | SRC_URI = "https://fonts.google.com/download?family=Open%20Sans;downloadfilename=Open_Sans.zip" |
41 | # Google packs fonts package on demand which results in unpredictable md5sum, so disable checksum check | 42 | # Google packs fonts package on demand which results in unpredictable md5sum, so disable checksum check |
42 | BB_STRICT_CHECKSUM = "" | 43 | BB_STRICT_CHECKSUM = "" |
43 | 44 | ||
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 @@ | |||
1 | From f26c3979ab0325edb2e410d287bc501cf00e0ac0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Nikos Mavrogiannopoulos <nmav@redhat.com> | ||
3 | Date: Mon, 22 Aug 2016 16:32:34 +0200 | ||
4 | Subject: [PATCH] rnd-linux: added check for SYS_getrandom being defined | ||
5 | |||
6 | This allows to compile the getrandom() code in old Linux systems | ||
7 | which do not have the system call defined. | ||
8 | --- | ||
9 | |||
10 | Upstream-Status: Backport | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | |||
13 | lib/nettle/rnd-linux.c | 6 +++++- | ||
14 | 1 file changed, 5 insertions(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/lib/nettle/rnd-linux.c b/lib/nettle/rnd-linux.c | ||
17 | index d7f07a6..7a24d05 100644 | ||
18 | --- a/lib/nettle/rnd-linux.c | ||
19 | +++ b/lib/nettle/rnd-linux.c | ||
20 | @@ -56,7 +56,11 @@ static dev_t _gnutls_urandom_fd_rdev = 0; | ||
21 | # else | ||
22 | # include <sys/syscall.h> | ||
23 | # undef getrandom | ||
24 | -# define getrandom(dst,s,flags) syscall(SYS_getrandom, (void*)dst, (size_t)s, (unsigned int)flags) | ||
25 | +# if defined(SYS_getrandom) | ||
26 | +# define getrandom(dst,s,flags) syscall(SYS_getrandom, (void*)dst, (size_t)s, (unsigned int)flags) | ||
27 | +# else | ||
28 | +# define getrandom(dst,s,flags) -1 | ||
29 | +# endif | ||
30 | # endif | ||
31 | |||
32 | static unsigned have_getrandom(void) | ||
33 | -- | ||
34 | libgit2 0.24.0 | ||
35 | |||
36 | |||
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 @@ | |||
1 | ############################################################################ | ||
2 | ## | ||
3 | ## Copyright (C) 2017 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 | |||
30 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | ||
31 | |||
32 | 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 = "\ | |||
57 | nativesdk-make \ | 57 | nativesdk-make \ |
58 | nativesdk-libgcc \ | 58 | nativesdk-libgcc \ |
59 | nativesdk-libstdc++ \ | 59 | nativesdk-libstdc++ \ |
60 | nativesdk-mingw-w64-winpthreads \ | ||
61 | " | 60 | " |
diff --git a/recipes/virtualbox/virtualbox-guest-additions_5.1.14.bb b/recipes/virtualbox/virtualbox-guest-additions_5.1.16.bb index 00dcaa5..752d8cb 100644 --- a/recipes/virtualbox/virtualbox-guest-additions_5.1.14.bb +++ b/recipes/virtualbox/virtualbox-guest-additions_5.1.16.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | ############################################################################ | 1 | ############################################################################ |
2 | ## | 2 | ## |
3 | ## Copyright (C) 2016 The Qt Company Ltd. | 3 | ## Copyright (C) 2017 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. |
@@ -38,8 +38,8 @@ PR = "${MACHINE_KERNEL_PR}" | |||
38 | 38 | ||
39 | SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/VirtualBox-${PV}.tar.bz2" | 39 | SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/VirtualBox-${PV}.tar.bz2" |
40 | 40 | ||
41 | SRC_URI[md5sum] = "21eaec9f21477d555559a63761779880" | 41 | SRC_URI[md5sum] = "37ebbd51370841eed8ab80f2f38446d6" |
42 | SRC_URI[sha256sum] = "8267bb026717c6e55237eb798210767d9c703cfcdf01224d9bc26f7dac9f228a" | 42 | SRC_URI[sha256sum] = "78071c3172f3bd3c7981c352c3ae6c6a9c01f6ab24bc0aa7ec79f3528b2291a7" |
43 | 43 | ||
44 | S = "${WORKDIR}/vbox" | 44 | S = "${WORKDIR}/vbox" |
45 | 45 | ||
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 @@ | |||
16 | 16 | ||
17 | <project name="poky" | 17 | <project name="poky" |
18 | remote="yocto" | 18 | remote="yocto" |
19 | revision="8ab3fa375891eba3dc102b6ee7fee3582070654b" | 19 | revision="4a39979c8d1e560fa54240e99734a651dfbaa63a" |
20 | path="sources/poky"/> | 20 | path="sources/poky"/> |
21 | <project name="meta-openembedded" | 21 | <project name="meta-openembedded" |
22 | remote="oe-mirror" | 22 | remote="oe-mirror" |
23 | revision="fe5c83312de11e80b85680ef237f8acb04b4b26e" | 23 | revision="5e82995148a2844c6f483ae5ddd1438d87ea9fb7" |
24 | path="sources/meta-openembedded"/> | 24 | path="sources/meta-openembedded"/> |
25 | <project name="meta-qt5" | 25 | <project name="meta-qt5" |
26 | remote="qtyocto" | 26 | remote="qtyocto" |
27 | revision="044ba1621532deed80ef79a15f5b225d8b9471ec" | 27 | revision="7beedb16cd1ab7afd7ace29a2eea3f5f7d7140a3" |
28 | path="sources/meta-qt5"/> | 28 | path="sources/meta-qt5"/> |
29 | <project name="meta-mingw" | 29 | <project name="meta-mingw" |
30 | remote="qtyocto" | 30 | remote="qtyocto" |
31 | revision="46d0746d53f863d9d76fa117f1259459803a36e3" | 31 | revision="27ccecd47b5e745d4c6a11708dd42a90cc235fb3" |
32 | path="sources/meta-mingw"/> | 32 | path="sources/meta-mingw"/> |
33 | 33 | ||
34 | <project name="meta-freescale" | 34 | <project name="meta-freescale" |
35 | remote="freescale" | 35 | remote="freescale" |
36 | revision="fc804d29ee85d58e9bb66f7319e749b53e192457" | 36 | revision="98d57b06d88cb22129bd417a9a3edbaf24612460" |
37 | path="sources/meta-freescale" | 37 | path="sources/meta-freescale" |
38 | groups="notdefault,external,fsl,toradex,ti,smx6,renesas-gen3"/> | 38 | groups="notdefault,external,fsl,toradex,ti,smx6,renesas-gen3"/> |
39 | <project name="meta-freescale-3rdparty" | 39 | <project name="meta-freescale-3rdparty" |
40 | remote="freescale" | 40 | remote="freescale" |
41 | revision="a78b17c24e66567f272ad47f9d6300e6b1b90c29" | 41 | revision="fd3962a994b2f477d3e81fa7083f6b3d4e666df5" |
42 | path="sources/meta-freescale-3rdparty" | 42 | path="sources/meta-freescale-3rdparty" |
43 | groups="notdefault,external,fsl,toradex,smx6"/> | 43 | groups="notdefault,external,fsl,toradex,smx6"/> |
44 | <project name="meta-ti" | 44 | <project name="meta-ti" |
@@ -48,17 +48,17 @@ | |||
48 | groups="notdefault,external,ti"/> | 48 | groups="notdefault,external,ti"/> |
49 | <project name="meta-raspberrypi" | 49 | <project name="meta-raspberrypi" |
50 | remote="yocto" | 50 | remote="yocto" |
51 | revision="380bf2ff445c2049bdea15f3bb36e8cb36540345" | 51 | revision="8ba2d6fc80b31c87d25c87c863e2a77752b07c3c" |
52 | path="sources/meta-raspberrypi" | 52 | path="sources/meta-raspberrypi" |
53 | groups="notdefault,external,rpi"/> | 53 | groups="notdefault,external,rpi"/> |
54 | <project name="meta-intel" | 54 | <project name="meta-intel" |
55 | remote="intel" | 55 | remote="intel" |
56 | revision="6add41510412ca196efb3e4f949d403a8b6f35d7" | 56 | revision="7e8f98aa326f16edd679a95f7bb2daf4256479f3" |
57 | path="sources/meta-intel" | 57 | path="sources/meta-intel" |
58 | groups="notdefault,external,intel"/> | 58 | groups="notdefault,external,intel"/> |
59 | <project name="meta-tegra" | 59 | <project name="meta-tegra" |
60 | remote="madisongh" | 60 | remote="madisongh" |
61 | revision="fba09b70a8ac36248e5fcea611e3bb661bb089fc" | 61 | revision="65bc6c3b285a7b6d5df72318de56e6068039e668" |
62 | path="sources/meta-tegra" | 62 | path="sources/meta-tegra" |
63 | groups="notdefault,external,jetson"/> | 63 | groups="notdefault,external,jetson"/> |
64 | <project name="meta-renesas" | 64 | <project name="meta-renesas" |