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:17:28 +0000 |
commit | 94f827ef0d752f0b6c8cd5a236f39219460e4e58 (patch) | |
tree | 3e2151794e8d2df86a7d6e893a95ec7a97bb05bc /meta/recipes-connectivity/connman/connman_1.38.bb | |
parent | 30ae4f13b50668f837684e3a8e935cf08bdbb1ea (diff) | |
download | poky-94f827ef0d752f0b6c8cd5a236f39219460e4e58.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.
(From OE-Core rev: 99d55bd094fe3d12724d77af3f15e2494cad4e0d)
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 | |||
3 | SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ | 3 | SRC_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 \ | ||
7 | file://connman \ | 6 | file://connman \ |
8 | file://no-version-scripts.patch \ | 7 | file://no-version-scripts.patch \ |
9 | " | 8 | " |