MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

connman: Set dns-backend automatically

Browse Source 
connman supports systemd-resolved as a resolver, select it automatically when
DISTRO_FEATURES includes systemd-resolved support, then drop the patch which
disables connman when systemd-resolved is active.

(From OE-Core rev: bec0cfc9b21566348886a8122c9b0756539b416d)

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alex Kiernan 2025-04-17 03:29:18 +00:00 committed by Richard Purdie
parent 4c57a5d461
commit 9fc13b1ad4
2 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-resolved-when-we-use-co.patch
View File

@ -1,26 +0,0 @@
From 19aff57e4da920d9ca972903582305b4efe81ef3 Mon Sep 17 00:00:00 2001
From: "Maxin B. John" <maxin.john@intel.com>
Date: Mon, 12 Jun 2017 16:52:39 +0300
Subject: [PATCH] connman.service: stop systemd-resolved when we use connman
Stop systemd-resolved service when we use connman as network manager.
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
src/connman.service.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/connman.service.in b/src/connman.service.in
index 7376346..79e75d6 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-resolved.service
[Service]
Type=dbus

2
meta/recipes-connectivity/connman/connman_1.44.bb
View File

@ -19,7 +19,6 @@ CVE_PRODUCT = "connman connection_manager"
DEPENDS = "dbus glib-2.0" DEPENDS = "dbus glib-2.0"
SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
file://0001-connman.service-stop-systemd-resolved-when-we-use-co.patch \
file://connman \ file://connman \
file://0002-resolve-musl-does-not-implement-res_ninit.patch \ file://0002-resolve-musl-does-not-implement-res_ninit.patch \
" "
@ -40,6 +39,7 @@ EXTRA_OECONF += "\
--enable-tools \ --enable-tools \
--disable-polkit \ --disable-polkit \
--runstatedir='${runtimedir}' \ --runstatedir='${runtimedir}' \
--with-dns-backend='${@bb.utils.contains("DISTRO_FEATURES", "systemd-resolved", "systemd-resolved", "internal", d)}' \
" "
# For smooth operation it would be best to start only one wireless daemon at a time. # For smooth operation it would be best to start only one wireless daemon at a time.
# If wpa-supplicant is running, connman will use it preferentially. # If wpa-supplicant is running, connman will use it preferentially.