[PATCH 0/1] busybox: remove syslog-startup.conf if sysvinit not in DISTRO_FEATURES

[PATCH 0/1] busybox: remove syslog-startup.conf if sysvinit not in DISTRO_FEATURES

[Qi.Chen]

From: Chen Qi <Qi.Chen@windriver.com>

The following changes since commit f63e7f4323368c0d6fe7a1d44393a7e15652d4f2:

  subversion: Add patch to use neon 0.30 (2013-08-07 07:43:47 +0100)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib ChenQi/busybox-systemd
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/busybox-systemd

Chen Qi (1):
  busybox: remove syslog-startup.conf if sysvinit not in
    DISTRO_FEATURES

 meta/recipes-core/busybox/busybox.inc |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

-- 
1.7.9.5

[PATCH 1/1] busybox: remove syslog-startup.conf if sysvinit not in DISTRO_FEATURES

[Qi.Chen]

From: Chen Qi <Qi.Chen@windriver.com>

sysvinit and systemd have different ideas about configuration files (or
environment files in systemd), so basically we can't use the same one in
both cases.

To avoid confusion, this patch removes syslog-startup.conf if 'sysvinit'
is not in DISTRO_FEATURES.

[YOCTO #4837]
[YOCTO #4860]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-core/busybox/busybox.inc |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 2f26953..8b38c1a 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -274,25 +274,28 @@ do_install () {
 
         ln -sf /dev/null ${D}${systemd_unitdir}/system/syslog.service
     fi
+
+    # Remove the sysvinit specific configuration file for systemd systems to avoid confusion
+    if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'false', 'true', d)}; then
+	rm ${D}${sysconfdir}/syslog-startup.conf.${BPN}
+    fi
 }
 
 inherit update-alternatives
 
 ALTERNATIVE_PRIORITY = "50"
 
-ALTERNATIVE_${PN}-syslog = "syslog-startup-conf"
-
 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)))
+        d.appendVar('ALTERNATIVE_%s-syslog' % (pn), ' syslog-startup-conf')
+        d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-startup-conf', '%s/syslog-startup.conf' % (d.getVar('sysconfdir', True)))
+        d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-startup-conf', '%s/syslog-startup.conf.%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}"
-
 python do_package_prepend () {
     # We need to load the full set of busybox provides from the /etc/busybox.links
     # Use this to see the update-alternatives with the right information
-- 
1.7.9.5