mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00
Code Issues Projects Releases Wiki Activity

Revert "connman: set service to conflict with systemd-networkd"

Browse Source 
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.

(From OE-Core rev: 99d55bd094fe3d12724d77af3f15e2494cad4e0d)

Signed-off-by: Jack Mitchell <ml@embed.me.uk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jack Mitchell
2020-12-03 10:35:00 +00:00
committed by Richard Purdie
parent 30ae4f13b5
commit 94f827ef0d
2 changed files with 0 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch
-29
View File
@@ -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
meta/recipes-connectivity/connman/connman_1.38.bb
-1
View File
@@ -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 \
"