diff options
author | Jack Mitchell <ml@embed.me.uk> | 2020-12-03 10:35:00 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-06 23:16:50 +0000 |
commit | 99d55bd094fe3d12724d77af3f15e2494cad4e0d (patch) | |
tree | 59a5effef4cf2fa2c4123e1c012d0066acc886e9 /meta/recipes-connectivity/connman/connman_1.38.bb | |
parent | 5bfe5dfeb0603f748e95378be150fc02d021666f (diff) | |
download | openembedded-core-contrib-99d55bd094fe3d12724d77af3f15e2494cad4e0d.tar.gz |
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>
Diffstat (limited to 'meta/recipes-connectivity/connman/connman_1.38.bb')
-rw-r--r-- | meta/recipes-connectivity/connman/connman_1.38.bb | 1 |
1 files changed, 0 insertions, 1 deletions
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 \ " |