diff options
| author |   Muhammad Shakeel <muhammad_shakeel@mentor.com> | 2013-07-29 13:09:52 +0500 |
|---|---|---|
| committer |   Saul Wold <sgw@linux.intel.com> | 2013-07-30 07:25:39 -0700 |
| commit | 29c3ecee32d9bfb03099a4f10456fd0270e107fb (patch) | |
| tree | e34e6cc2551e2f52f4457911e2369fe519f41825 /meta/recipes-core/busybox/busybox.inc | |
| parent | 823c90ad344ca2205f3055e2dcae08c6616f29b7 (diff) | |
| download | openembedded-core-contrib-29c3ecee32d9bfb03099a4f10456fd0270e107fb.tar.gz | |
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
Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/busybox/busybox.inc')
| -rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 11 |
1 files changed, 8 insertions, 3 deletions
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}" |