summaryrefslogtreecommitdiffstats
path: root/meta-boot2qt
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2019-01-14 14:55:08 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2019-02-01 06:58:28 +0000
commit866106a38dae09dbba01d6a9d77bc80189f94ad8 (patch)
tree043b512df5417f74f5810803aafad34ef313ffe1 /meta-boot2qt
parente2e0faabe64b922df8865ca1df23768ebc3b1fcf (diff)
downloadmeta-boot2qt-866106a38dae09dbba01d6a9d77bc80189f94ad8.tar.gz
yocto: upgrade to yocto 2.6 (thud)
Initial upgrade commit from yocto 2.5.2 (sumo) -> 2.6 (thud). System & some group 1 devices related meta layers, appends & patches updated: * poky, meta-openembedded & meta-mingw updated to thud branch - layer.conf files updated to support thud where applicable - obsolete gstreamer-plugins-bad BBMASK + bbappend overide removed - ostree build issues fixed with upstream submodule patch * meta-freescale & meta-freescale-3rdparty updated to thud branch * meta-toradex-bsp-common & meta-toradex-nxp update to latest tagged release (2.8b5) in toradex/rocko branch - to fix build issue a systemd patch taken from meta-toradex-bsp-common toradex/master-next branch (thud compatible) - mask gstreamer recipes from toradex layer and use older versions for libav and plugins-ugly, so that they match the imx version of gstreamer. * meta-raspberry update to latest in master branch (where thud layer compatibility is set) * meta-tegra update to latest in thud branch - vulkan disabled from jetsons since NVIDIA's Vulkan support is for X only Task-number: QTBUG-72413 Change-Id: Ida277b66840babc23e877161a26f1ae1b3c68fda Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'meta-boot2qt')
-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
3 files changed, 39 insertions, 3 deletions
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"