[OE-core] [warrior][PATCH] systemd: Expose resolv-conf alternative only when resolved is built

[akuster808]

On 10/4/19 12:47 AM, Alexandre Bard wrote:
> 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.
Does Master have this issue?

- armin
>
> Signed-off-by: Alexandre Bard <alexandre.bard at netmodule.com>
> ---
>  meta/recipes-core/systemd/systemd_241.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-core/systemd/systemd_241.bb b/meta/recipes-core/systemd/systemd_241.bb
> index eb3242d624..0add384a7b 100644
> --- a/meta/recipes-core/systemd/systemd_241.bb
> +++ b/meta/recipes-core/systemd/systemd_241.bb
> @@ -601,7 +601,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"