summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/busybox
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-05 17:39:31 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-05 18:00:00 +0100
commitef11c54ba99af261a70ec31091216cdd1556da24 (patch)
treef63057c916bf616e8a5d64ec703faf1060e37839 /meta/recipes-core/busybox
parented6e039bf9b16ea882995780425b33b84f9356cf (diff)
downloadopenembedded-core-contrib-ef11c54ba99af261a70ec31091216cdd1556da24.tar.gz
openembedded-core-contrib-ef11c54ba99af261a70ec31091216cdd1556da24.tar.bz2
openembedded-core-contrib-ef11c54ba99af261a70ec31091216cdd1556da24.zip
busybox: Put klogd/syslogd alternative links in syslog package
Currently these are in ${PN} and ${PN}-syslog may get replaced by other packages but update-alternatives would error in the postinst if other files were installed first. Avoid the problems by putting the links in the correct package. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/busybox')
-rw-r--r--meta/recipes-core/busybox/busybox.inc5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 77aa541376..c02e0623e3 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -371,7 +371,10 @@ python do_package_prepend () {
# Match coreutils
if alt_name == '[':
alt_name = 'lbracket'
- d.appendVar('ALTERNATIVE_%s' % (pn), ' ' + alt_name)
+ if alt_name == 'klogd' or alt_name == 'syslogd':
+ d.appendVar('ALTERNATIVE_%s-syslog' % (pn), ' ' + alt_name)
+ else:
+ d.appendVar('ALTERNATIVE_%s' % (pn), ' ' + alt_name)
d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, alt_link_name)
if os.path.exists('%s%s' % (dvar, target)):
d.setVarFlag('ALTERNATIVE_TARGET', alt_name, target)