[oe-commits] [openembedded-core] 06/10: systemd: Expose resolv-conf alternative only when resolved is built

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 85b0e002d8c93122ee0643924a2122c3631b4060
Author: Alexandre Bard <Alexandre.Bard at netmodule.com>
AuthorDate: Wed Oct 2 12:12:22 2019 +0000

    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 at netmodule.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 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 eaa12ed..b909759 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"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.