From 94f827ef0d752f0b6c8cd5a236f39219460e4e58 Mon Sep 17 00:00:00 2001 From: Jack Mitchell Date: Thu, 3 Dec 2020 10:35:00 +0000 Subject: 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. (From OE-Core rev: 99d55bd094fe3d12724d77af3f15e2494cad4e0d) Signed-off-by: Jack Mitchell Signed-off-by: Richard Purdie --- meta/recipes-connectivity/connman/connman_1.38.bb | 1 - 1 file changed, 1 deletion(-) (limited to 'meta/recipes-connectivity/connman/connman_1.38.bb') diff --git a/meta/recipes-connectivity/connman/connman_1.38.bb b/meta/recipes-connectivity/connman/connman_1.38.bb index 45c2934dec..027c41e9af 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 \ " -- cgit v1.2.3-54-g00ecf