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.

(From OE-Core rev: 91efc50723229672b6e8187b69b183cba525f199)

Signed-off-by: Alexandre Bard <alexandre.bard@netmodule.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexandre Bard
2019-10-02 12:12:22 +00:00
committed by Richard Purdie
parent e66afddf41
commit fb427f4f5c

View File

@@ -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"