From 6c17d88c4f276e25d29609223a251bf3e7551ee9 Mon Sep 17 00:00:00 2001 From: Tobias Olausson Date: Tue, 19 Dec 2017 18:33:57 +0100 Subject: 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 Reviewed-by: Gordan Markus --- recipes/connman/connman_%.bbappend | 2 +- ...disable-connman-when-booting-over-nfs-1.33.patch | 21 +++++++++++++++++++++ ...disable-connman-when-booting-over-nfs-1.34.patch | 11 +++++++++++ ...0001-disable-connman-when-booting-over-nfs.patch | 21 --------------------- 4 files changed, 33 insertions(+), 22 deletions(-) create mode 100644 recipes/connman/files/0001-disable-connman-when-booting-over-nfs-1.33.patch create mode 100644 recipes/connman/files/0001-disable-connman-when-booting-over-nfs-1.34.patch delete mode 100644 recipes/connman/files/0001-disable-connman-when-booting-over-nfs.patch 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-1.33.patch b/recipes/connman/files/0001-disable-connman-when-booting-over-nfs-1.33.patch new file mode 100644 index 0000000..f893746 --- /dev/null +++ b/recipes/connman/files/0001-disable-connman-when-booting-over-nfs-1.33.patch @@ -0,0 +1,21 @@ +From df70770f33280a915abb413678088a078d82341a Mon Sep 17 00:00:00 2001 +From: Mikko Gronoff +Date: Tue, 20 Sep 2016 11:02:50 +0300 +Subject: [PATCH] Disable connman when booting over NFS + +--- + src/connman.service.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/connman.service.in b/src/connman.service.in +index 09dfec9..4132cf7 100644 +--- a/src/connman.service.in ++++ b/src/connman.service.in +@@ -6,6 +6,7 @@ RequiresMountsFor=@localstatedir@/lib/connman + After=dbus.service network-pre.target systemd-sysusers.service + Before=network.target multi-user.target shutdown.target + Wants=network.target ++ConditionKernelCommandLine=!root=/dev/nfs + + [Service] + Type=dbus 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 + 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.patch deleted file mode 100644 index f893746..0000000 --- a/recipes/connman/files/0001-disable-connman-when-booting-over-nfs.patch +++ /dev/null @@ -1,21 +0,0 @@ -From df70770f33280a915abb413678088a078d82341a Mon Sep 17 00:00:00 2001 -From: Mikko Gronoff -Date: Tue, 20 Sep 2016 11:02:50 +0300 -Subject: [PATCH] Disable connman when booting over NFS - ---- - src/connman.service.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/connman.service.in b/src/connman.service.in -index 09dfec9..4132cf7 100644 ---- a/src/connman.service.in -+++ b/src/connman.service.in -@@ -6,6 +6,7 @@ RequiresMountsFor=@localstatedir@/lib/connman - After=dbus.service network-pre.target systemd-sysusers.service - Before=network.target multi-user.target shutdown.target - Wants=network.target -+ConditionKernelCommandLine=!root=/dev/nfs - - [Service] - Type=dbus -- cgit v1.2.3-54-g00ecf