connman: choose correct patch for connman version

For building with rocko as the upstream, the connman version (and with
that the systemd service file) has been updated. We should select the
correct patch for the version of connman we're building.

Change-Id: I3e620e383c25d32c2c2e054092cbca81538f4b8a
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Reviewed-by: Gordan Markus <gordan.markus@pelagicore.com>

3 files changed, 12 insertions, 1 deletions

diff --git a/recipes/connman/connman_%.bbappend b/recipes/connman/connman_%.bbappend
index 0b03755..fda246a 100644
--- a/recipes/connman/connman_%.bbappend
+++ b/recipes/connman/connman_%.bbappend
@@ -21,4 +21,4 @@
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
-SRC_URI += "file://0001-disable-connman-when-booting-over-nfs.patch"
+SRC_URI += "file://0001-disable-connman-when-booting-over-nfs-${PV}.patch"
diff --git a/recipes/connman/files/0001-disable-connman-when-booting-over-nfs.patch b/recipes/connman/files/0001-disable-connman-when-booting-over-nfs-1.33.patch
index f893746..f893746 100644
--- a/recipes/connman/files/0001-disable-connman-when-booting-over-nfs.patch
+++ b/recipes/connman/files/0001-disable-connman-when-booting-over-nfs-1.33.patch
diff --git a/recipes/connman/files/0001-disable-connman-when-booting-over-nfs-1.34.patch b/recipes/connman/files/0001-disable-connman-when-booting-over-nfs-1.34.patch
new file mode 100644
index 0000000..8b46666
--- /dev/null
+++ b/recipes/connman/files/0001-disable-connman-when-booting-over-nfs-1.34.patch
@@ -0,0 +1,11 @@
+--- a/src/connman.service.in
++++ b/src/connman.service.in
+@@ -7,6 +7,7 @@
+ Before=network.target multi-user.target shutdown.target
+ Wants=network.target
+ Conflicts=systemd-resolved.service
++ConditionKernelCommandLine=!root=/dev/nfs
+ 
+ [Service]
+ Type=dbus
+