aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Mitchell <ml@embed.me.uk>2020-12-03 10:35:00 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-06 23:16:50 +0000
commit99d55bd094fe3d12724d77af3f15e2494cad4e0d (patch)
tree59a5effef4cf2fa2c4123e1c012d0066acc886e9
parent5bfe5dfeb0603f748e95378be150fc02d021666f (diff)
downloadopenembedded-core-contrib-99d55bd094fe3d12724d77af3f15e2494cad4e0d.tar.gz
openembedded-core-contrib-99d55bd094fe3d12724d77af3f15e2494cad4e0d.tar.bz2
openembedded-core-contrib-99d55bd094fe3d12724d77af3f15e2494cad4e0d.zip
Revert "connman: set service to conflict with systemd-networkd"
Without further examples of how this is failing revert as using both together is a valid use case, for example connman handling Wifi/AP and systemd-networkd handling more complex routing such as for containers and ethernet switches. This reverts commit 5303420ead25817f5caec276b79eec7ee797271a. Signed-off-by: Jack Mitchell <ml@embed.me.uk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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, 0 insertions, 30 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
deleted file mode 100644
index dd012750a43..00000000000
--- a/meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9fea099d0a3ece37d80ad70d32ebb8a93f8f3280 Mon Sep 17 00:00:00 2001
-From: Yi Zhao <yi.zhao@windriver.com>
-Date: Fri, 30 Oct 2020 13:48:45 +0800
-Subject: [PATCH] connman.service: stop systemd-networkd when using connman
-
-Stop systemd-networkd service when we use connman as network manager.
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
----
- src/connman.service.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/connman.service.in b/src/connman.service.in
-index 79e75d6..014eafe 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
-+Conflicts=systemd-networkd.service systemd-networkd.socket
- Conflicts=systemd-resolved.service
-
- [Service]
---
-2.17.1
-
diff --git a/meta/recipes-connectivity/connman/connman_1.38.bb b/meta/recipes-connectivity/connman/connman_1.38.bb
index 45c2934decf..027c41e9afa 100644
--- a/meta/recipes-connectivity/connman/connman_1.38.bb
+++ b/meta/recipes-connectivity/connman/connman_1.38.bb
@@ -3,7 +3,6 @@ require connman.inc
SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
file://0001-connman.service-stop-systemd-resolved-when-we-use-co.patch \
- file://0001-connman.service-stop-systemd-networkd-when-using-con.patch \
file://connman \
file://no-version-scripts.patch \
"