[OE-core] [sumo][PATCH] systemd: Expose resolv-conf alternative only when resolved is built

Alexandre Bard Alexandre.Bard at netmodule.com
Fri Oct 4 07:51:17 UTC 2019


When systemd is built without internal resolver, it does not make
sense to expose it as a resolv-conf alternative and can even break
images where this alternative would be chosen, because of an
invalid symlink.

Signed-off-by: Alexandre Bard <alexandre.bard at netmodule.com>
---
 meta/recipes-core/systemd/systemd_237.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-core/systemd/systemd_237.bb b/meta/recipes-core/systemd/systemd_237.bb
index a0e5d512e0..d3a6d52a73 100644
--- a/meta/recipes-core/systemd/systemd_237.bb
+++ b/meta/recipes-core/systemd/systemd_237.bb
@@ -548,6 +548,7 @@ python __anonymous() {
 # TODO:
 # u-a for runlevel and telinit
 
+ALTERNATIVE_${PN} = "init halt reboot shutdown poweroff runlevel ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolv-conf', '', d)}"
 ALTERNATIVE_${PN} = "init halt reboot shutdown poweroff runlevel resolv-conf"
 
 ALTERNATIVE_TARGET[init] = "${rootlibexecdir}/systemd/systemd"
-- 
2.20.1



More information about the Openembedded-core mailing list