[OE-core] [PATCH 2/2] sysklogd: lower the ALTERNATIVE_PRIORITY in case of systemd

Peter A. Bigot pab at pabigot.com
Mon Sep 2 11:58:48 UTC 2013


On 09/02/2013 06:40 AM, Qi.Chen at windriver.com wrote:
> From: Chen Qi <Qi.Chen at windriver.com>
>
> The sysklogd package hasn't got systemd support yet. So in case of
> a systemd based system, the commands and corresponding configuration
> files should have a lower priority than that of the busybox's syslogd
> and klogd utilities. These two utilities from busybox have internal
> systemd support if CONFIG_FEATURE_SYSTEMD is enabled. And that config
> item is enabled by default.
>
> [YOCTO #5066]
>
> Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
> ---
>   meta/recipes-extended/sysklogd/sysklogd.inc |    9 ++++++++-
>   1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc
> index 1167328..30dac2d 100644
> --- a/meta/recipes-extended/sysklogd/sysklogd.inc
> +++ b/meta/recipes-extended/sysklogd/sysklogd.inc
> @@ -38,7 +38,14 @@ do_install () {
>   	install -m 755 ${WORKDIR}/sysklogd ${D}${sysconfdir}/init.d/syslog
>   }
>   
> -ALTERNATIVE_PRIORITY = "100"
> +python () {
> +    # sysklogd package has no internal systemd support, so we weigh busybox's
> +    # sysklogd utility over it in case of systemd
> +    if 'systemd' in d.getVar("DISTRO_FEATURES", True).split():
> +        d.setVar("ALTERNATIVE_PRIORITY", "10")
> +    else:
> +        d.setVar("ALTERNATIVE_PRIORITY", "100")
> +}

Is there a reason an anonymous python block is better for this purpose than:

ALTERNATIVE_PRIORITY = "${@base_contains('DISTRO_FEATURES','systemd','10','100',d)}"

?

>   ALTERNATIVE_${PN} = "syslogd klogd syslog-init syslog-conf"
>   




More information about the Openembedded-core mailing list