From fe378e1d462d2c44b0e73c0d5b8647c3d90d300d Mon Sep 17 00:00:00 2001 From: Muhammad Shakeel Date: Mon, 29 Jul 2013 13:09:52 +0500 Subject: busybox: Add syslog-init alternative only if SysV in enabled If systemd is enabled then syslog is handled through a service file and related files in /etc/init.d are removed. This removes following warning: WARNING: busybox: NOT adding alternative provide /etc/init.d/syslog: /etc/init.d/syslog.busybox does not exist (From OE-Core rev: 29c3ecee32d9bfb03099a4f10456fd0270e107fb) Signed-off-by: Muhammad Shakeel Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-core/busybox/busybox.inc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'meta/recipes-core/busybox/busybox.inc') diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index acd2bfbcff..2f269534bb 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -280,10 +280,15 @@ inherit update-alternatives ALTERNATIVE_PRIORITY = "50" -ALTERNATIVE_${PN}-syslog = "syslog-init syslog-startup-conf" +ALTERNATIVE_${PN}-syslog = "syslog-startup-conf" -ALTERNATIVE_LINK_NAME[syslog-init] = "${sysconfdir}/init.d/syslog" -ALTERNATIVE_TARGET[syslog-init] = "${sysconfdir}/init.d/syslog.${BPN}" +python () { + if 'sysvinit' in d.getVar("DISTRO_FEATURES", True).split(): + pn = d.getVar('PN', True) + d.appendVar('ALTERNATIVE_%s-syslog' % (pn), ' syslog-init') + d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-init', '%s/init.d/syslog' % (d.getVar('sysconfdir', True))) + d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-init', '%s/init.d/syslog.%s' % (d.getVar('sysconfdir', True), d.getVar('BPN', True))) +} ALTERNATIVE_LINK_NAME[syslog-startup-conf] = "${sysconfdir}/syslog-startup.conf" ALTERNATIVE_TARGET[syslog-startup-conf] = "${sysconfdir}/syslog-startup.conf.${BPN}" -- cgit v1.2.3-54-g00ecf