From 157e9da45447420942bf136ce5c383f46a1b4429 Mon Sep 17 00:00:00 2001
From: Gatis Paeglis <gatis.paeglis@qt.io>
Date: Wed, 22 Jun 2016 11:07:46 +0200
Subject: systemd: handle bind mounts set from initramfs

06e97888883e2cc12eb6514e80c7f0014295f59b broke bind mount
handling (set from initramfs) in systemd. This is fixed in
more recent version of systemd by 97839ed6b7b19e2cb885a152b54fbd32334294e2.

Ref: https://github.com/systemd/systemd/issues/1556

Change-Id: I7fbddb90086524a7a77b71b5fc69309e073bc66f
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
---
 ...-mount-add-dependencies-to-dynamically-mo.patch | 27 ++++++++++++++++++++++
 recipes/systemd/systemd_%.bbappend                 | 11 +++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 recipes/systemd/systemd/0020-Revert-core-mount-add-dependencies-to-dynamically-mo.patch

diff --git a/recipes/systemd/systemd/0020-Revert-core-mount-add-dependencies-to-dynamically-mo.patch b/recipes/systemd/systemd/0020-Revert-core-mount-add-dependencies-to-dynamically-mo.patch
new file mode 100644
index 0000000..ed58b50
--- /dev/null
+++ b/recipes/systemd/systemd/0020-Revert-core-mount-add-dependencies-to-dynamically-mo.patch
@@ -0,0 +1,27 @@
+From 6a7105e23d8be76094b90d814eab9135e2cc4b8a Mon Sep 17 00:00:00 2001
+From: Gatis Paeglis <gatis.paeglis@qt.io>
+Date: Tue, 21 Jun 2016 15:26:47 +0200
+Subject: [PATCH] Revert "core/mount: add dependencies to dynamically mounted
+ mounts too"
+
+This reverts commit 06e97888883e2cc12eb6514e80c7f0014295f59b.
+---
+ src/core/mount.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/mount.c b/src/core/mount.c
+index fda4d65..3944232 100644
+--- a/src/core/mount.c
++++ b/src/core/mount.c
+@@ -337,7 +337,7 @@ static int mount_add_device_links(Mount *m) {
+ 
+         assert(m);
+ 
+-        p = get_mount_parameters(m);
++        p = get_mount_parameters_fragment(m);
+         if (!p)
+                 return 0;
+ 
+-- 
+2.7.4
+
diff --git a/recipes/systemd/systemd_%.bbappend b/recipes/systemd/systemd_%.bbappend
index 5594a3d..0877135 100644
--- a/recipes/systemd/systemd_%.bbappend
+++ b/recipes/systemd/systemd_%.bbappend
@@ -27,7 +27,18 @@
 ##
 ############################################################################
 
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI += "file://0020-Revert-core-mount-add-dependencies-to-dynamically-mo.patch"
+
 do_install_append() {
     # remove login from tty1
     rm -f ${D}${sysconfdir}/systemd/system/getty.target.wants/getty@tty1.service
 }
+
+do_verify_patch_required() {
+    if [ -n "$(cat ${S}/NEWS | grep "CHANGES WITH 229")" ]; then
+        bbwarn "systemd: The 0020-Revert-core-mount-add-dependencies-to-dynamically-mo.patch patch is not required anymore."
+    fi
+}
+
+addtask do_verify_patch_required after do_fetch before do_configure
-- 
cgit v1.2.3-54-g00ecf