]> code.ossystems Code Review - openembedded-core.git/commitdiff
busybox: Add syslog-init alternative only if SysV in enabled
authorMuhammad Shakeel <muhammad_shakeel@mentor.com>
Mon, 29 Jul 2013 08:09:52 +0000 (13:09 +0500)
committerSaul Wold <sgw@linux.intel.com>
Tue, 30 Jul 2013 14:25:39 +0000 (07:25 -0700)
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

Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
meta/recipes-core/busybox/busybox.inc

index acd2bfbcffb2fe989dcca2e1b3722302494b2a03..2f269534bb9430d6dcd18ec868033c5a066b0c8c 100644 (file)
@@ -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}"