summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2013-08-07 16:43:40 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-12 13:09:52 +0100
commit86d8d89c2101a9f6903949583751f95e75593105 (patch)
treee643bd00ab3bb50355fba84e34ea4cd16e0c7f73 /meta/recipes-core
parent290a5aef1f1de389d2c6432e659627f229cc44fb (diff)
downloadpoky-86d8d89c2101a9f6903949583751f95e75593105.tar.gz
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] (From OE-Core rev: 89f62147a61108b4be40001e1fbe3be33bacf00b) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-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 () {
274 274
275 ln -sf /dev/null ${D}${systemd_unitdir}/system/syslog.service 275 ln -sf /dev/null ${D}${systemd_unitdir}/system/syslog.service
276 fi 276 fi
277
278 # Remove the sysvinit specific configuration file for systemd systems to avoid confusion
279 if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'false', 'true', d)}; then
280 rm ${D}${sysconfdir}/syslog-startup.conf.${BPN}
281 fi
277} 282}
278 283
279inherit update-alternatives 284inherit update-alternatives
280 285
281ALTERNATIVE_PRIORITY = "50" 286ALTERNATIVE_PRIORITY = "50"
282 287
283ALTERNATIVE_${PN}-syslog = "syslog-startup-conf"
284
285python () { 288python () {
286 if 'sysvinit' in d.getVar("DISTRO_FEATURES", True).split(): 289 if 'sysvinit' in d.getVar("DISTRO_FEATURES", True).split():
287 pn = d.getVar('PN', True) 290 pn = d.getVar('PN', True)
288 d.appendVar('ALTERNATIVE_%s-syslog' % (pn), ' syslog-init') 291 d.appendVar('ALTERNATIVE_%s-syslog' % (pn), ' syslog-init')
289 d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-init', '%s/init.d/syslog' % (d.getVar('sysconfdir', True))) 292 d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-init', '%s/init.d/syslog' % (d.getVar('sysconfdir', True)))
290 d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-init', '%s/init.d/syslog.%s' % (d.getVar('sysconfdir', True), d.getVar('BPN', True))) 293 d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-init', '%s/init.d/syslog.%s' % (d.getVar('sysconfdir', True), d.getVar('BPN', True)))
294 d.appendVar('ALTERNATIVE_%s-syslog' % (pn), ' syslog-startup-conf')
295 d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-startup-conf', '%s/syslog-startup.conf' % (d.getVar('sysconfdir', True)))
296 d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-startup-conf', '%s/syslog-startup.conf.%s' % (d.getVar('sysconfdir', True), d.getVar('BPN', True)))
291} 297}
292 298
293ALTERNATIVE_LINK_NAME[syslog-startup-conf] = "${sysconfdir}/syslog-startup.conf"
294ALTERNATIVE_TARGET[syslog-startup-conf] = "${sysconfdir}/syslog-startup.conf.${BPN}"
295
296python do_package_prepend () { 299python do_package_prepend () {
297 # We need to load the full set of busybox provides from the /etc/busybox.links 300 # We need to load the full set of busybox provides from the /etc/busybox.links
298 # Use this to see the update-alternatives with the right information 301 # Use this to see the update-alternatives with the right information