From 91efc50723229672b6e8187b69b183cba525f199 Mon Sep 17 00:00:00 2001 From: Alexandre Bard Date: Wed, 2 Oct 2019 12:12:22 +0000 Subject: systemd: Expose resolv-conf alternative only when resolved is built 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 Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd_243.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/systemd/systemd_243.bb b/meta/recipes-core/systemd/systemd_243.bb index eaa12ed107..b9097593f1 100644 --- a/meta/recipes-core/systemd/systemd_243.bb +++ b/meta/recipes-core/systemd/systemd_243.bb @@ -637,7 +637,7 @@ python do_warn_musl() { } addtask warn_musl before do_configure -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" -- cgit 1.2.3-korg