summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Bard <Alexandre.Bard@netmodule.com>2019-10-02 12:12:22 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-10-02 20:22:02 +0100
commit91efc50723229672b6e8187b69b183cba525f199 (patch)
tree906a82299b7d5d1361dec93685d172d792ee923e
parentc63c7fb890ab356c747d6948ca9e13e0c3b83dfb (diff)
downloadopenembedded-core-contrib-91efc50723229672b6e8187b69b183cba525f199.tar.gz
openembedded-core-contrib-91efc50723229672b6e8187b69b183cba525f199.tar.bz2
openembedded-core-contrib-91efc50723229672b6e8187b69b183cba525f199.zip
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 <alexandre.bard@netmodule.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/systemd/systemd_243.bb2
1 files changed, 1 insertions, 1 deletions
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"