summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/connman
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2020-11-02 09:20:12 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-11-08 14:03:20 (GMT)
commit1dd508683d56395528fc939be430884f49fa1d42 (patch)
treec687d5304461b146d3b3ef95bc66d04af8292382 /meta/recipes-connectivity/connman
parent4b22009db58e0f48722f9d002efe329de5ef2e53 (diff)
downloadpoky-1dd508683d56395528fc939be430884f49fa1d42.tar.gz
connman: set service to conflict with systemd-networkd
Do not run systemd-networkd and connman simultaneously. These two network managers may conflict with each other. (From OE-Core rev: 5303420ead25817f5caec276b79eec7ee797271a) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/connman')
-rw-r--r--meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch29
-rw-r--r--meta/recipes-connectivity/connman/connman_1.38.bb1
2 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch b/meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch
new file mode 100644
index 0000000..dd01275
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch
@@ -0,0 +1,29 @@
1From 9fea099d0a3ece37d80ad70d32ebb8a93f8f3280 Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Fri, 30 Oct 2020 13:48:45 +0800
4Subject: [PATCH] connman.service: stop systemd-networkd when using connman
5
6Stop systemd-networkd service when we use connman as network manager.
7
8Upstream-Status: Inappropriate [configuration]
9
10Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
11---
12 src/connman.service.in | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/src/connman.service.in b/src/connman.service.in
16index 79e75d6..014eafe 100644
17--- a/src/connman.service.in
18+++ b/src/connman.service.in
19@@ -6,6 +6,7 @@ RequiresMountsFor=@localstatedir@/lib/connman
20 After=dbus.service network-pre.target systemd-sysusers.service
21 Before=network.target multi-user.target shutdown.target
22 Wants=network.target
23+Conflicts=systemd-networkd.service systemd-networkd.socket
24 Conflicts=systemd-resolved.service
25
26 [Service]
27--
282.17.1
29
diff --git a/meta/recipes-connectivity/connman/connman_1.38.bb b/meta/recipes-connectivity/connman/connman_1.38.bb
index 027c41e..45c2934 100644
--- a/meta/recipes-connectivity/connman/connman_1.38.bb
+++ b/meta/recipes-connectivity/connman/connman_1.38.bb
@@ -3,6 +3,7 @@ require connman.inc
3SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ 3SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
4 file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \ 4 file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
5 file://0001-connman.service-stop-systemd-resolved-when-we-use-co.patch \ 5 file://0001-connman.service-stop-systemd-resolved-when-we-use-co.patch \
6 file://0001-connman.service-stop-systemd-networkd-when-using-con.patch \
6 file://connman \ 7 file://connman \
7 file://no-version-scripts.patch \ 8 file://no-version-scripts.patch \
8 " 9 "