summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2013-08-07 16:43:40 +0800
committerSaul Wold <sgw@linux.intel.com>2013-08-09 08:54:46 -0700
commit89f62147a61108b4be40001e1fbe3be33bacf00b (patch)
treea754a73f6e2659c4fe986147a02cd5b745085d42
parent67b6d8d9f987a59090a9a8af61cf740207703dff (diff)
downloadopenembedded-core-89f62147a61108b4be40001e1fbe3be33bacf00b.tar.gz
openembedded-core-89f62147a61108b4be40001e1fbe3be33bacf00b.tar.bz2
openembedded-core-89f62147a61108b4be40001e1fbe3be33bacf00b.zip
busybox: remove syslog-startup.conf if sysvinit not in DISTRO_FEATURES
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> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/recipes-core/busybox/busybox.inc13
1 files changed, 8 insertions, 5 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 2f269534bb..8b38c1aaa8 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