* [thud][PATCH] systemd: Expose resolv-conf alternative only when resolved is built
@ 2019-10-04 7:49 Alexandre Bard
0 siblings, 0 replies; only message in thread
From: Alexandre Bard @ 2019-10-04 7:49 UTC (permalink / raw)
To: openembedded-core@lists.openembedded.org; +Cc: Alexandre Bard
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@netmodule.com>
---
meta/recipes-core/systemd/systemd_239.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/systemd/systemd_239.bb b/meta/recipes-core/systemd/systemd_239.bb
index 7fbd64ced7..0a3492f5b8 100644
--- a/meta/recipes-core/systemd/systemd_239.bb
+++ b/meta/recipes-core/systemd/systemd_239.bb
@@ -614,7 +614,7 @@ python __anonymous() {
d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1")
}
-ALTERNATIVE_${PN} = "halt reboot shutdown poweroff runlevel resolv-conf"
+ALTERNATIVE_${PN} = "halt reboot shutdown poweroff runlevel ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolv-conf', '', d)}"
ALTERNATIVE_TARGET[resolv-conf] = "${sysconfdir}/resolv-conf.systemd"
ALTERNATIVE_LINK_NAME[resolv-conf] = "${sysconfdir}/resolv.conf"
--
2.20.1
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2019-10-04 7:49 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-10-04 7:49 [thud][PATCH] systemd: Expose resolv-conf alternative only when resolved is built Alexandre Bard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox