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}"
 
 HOSTTOOLS += "git-lfs"
 
-LAYERSERIES_COMPAT_b2qt = "sumo"
+LAYERSERIES_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 @@
+From aa04ed9af553b979b19ef31a9ea2241789a15a60 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Wed, 11 Jul 2018 14:56:32 -0400
+Subject: [PATCH] libglnx.m4: Include stdio.h for renameat2
+
+glibc added it upstream:
+https://sourceware.org/git/?p=glibc.git;a=commit;h=d6da5cb6a8e0e8a9ce92b7d951a254cf325248d7
+
+But we need the right header.
+Ref: https://github.com/flatpak/flatpak/issues/1890
+---
+ libglnx.m4 | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libglnx.m4 b/libglnx.m4
+index 43dff97..fd68717 100644
+--- a/libglnx.m4
++++ b/libglnx.m4
+@@ -6,6 +6,7 @@ AC_CHECK_DECLS([
+         [], [], [[
+ #include <sys/types.h>
+ #include <unistd.h>
++#include <stdio.h>
+ #include <sys/mount.h>
+ #include <fcntl.h>
+ #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
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
 
+SRC_URI[libglnx.md5sum] = "110edb31abcea2fbdacbe0b3adf7eee4"
+SRC_URI[libglnx.sha256sum] = "b2de841b0efe12803930f5e21fe46ef4f4c5180fb59576feb5902c944761d27a"
+
 inherit autotools pkgconfig systemd
 
 SRC_URI = " \
@@ -47,12 +50,19 @@ SRC_URI = " \
     file://Workaround-the-SIGCHLD-handler-issue.patch \
     file://workaround-gtkdocize-configure-issue-in-autog.patch \
     "
+SRC_URI += " \
+    git://gitlab.gnome.org/GNOME/libglnx;name=libglnx;branch=master;protocol=https;destsuffix=git/libglnx \
+    file://0001-libglnx.m4-Include-stdio.h-for-renameat2.patch;patchdir=libglnx \
+    "
 
-SRCREV = "8ece4d6d51bdbe3e41ab318259276bb83e553aa0"
+SRCREV_ostree = "8ece4d6d51bdbe3e41ab318259276bb83e553aa0"
+SRCREV_libglnx = "4ae5e3beaaa674abfabf7404ab6fafcc4ec547db"
+SRCREV = "${SRCREV_ostree}"
 
 S = "${WORKDIR}/git"
 
-DEPENDS = "glib-2.0 glib-2.0-native e2fsprogs gpgme attr libsoup-2.4 libassuan xz systemd"
+DEPENDS = "glib-2.0 glib-2.0-native e2fsprogs gpgme attr libsoup-2.4 libassuan xz systemd bison-native"
+
 # Bash is needed by the shipped dracut module. This dracut module is used to generate initramfs image.
 # The production image do not require bash for proper working.
 RDEPENDS_${PN} += "bash"