diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-05 17:39:31 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-05 18:00:25 +0100 |
commit | 705bb5e8479b814efc2970b79f8709b4364f189d (patch) | |
tree | 85f86783a8aecceeae75a4cb824ed277013cdcd9 /meta/recipes-core | |
parent | 9fb645f0dfeb4d1863a2162d331b04eabad6f570 (diff) | |
download | poky-705bb5e8479b814efc2970b79f8709b4364f189d.tar.gz |
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.
(From OE-Core rev: ef11c54ba99af261a70ec31091216cdd1556da24)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 5 |
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 () { | |||
371 | # Match coreutils | 371 | # Match coreutils |
372 | if alt_name == '[': | 372 | if alt_name == '[': |
373 | alt_name = 'lbracket' | 373 | alt_name = 'lbracket' |
374 | d.appendVar('ALTERNATIVE_%s' % (pn), ' ' + alt_name) | 374 | if alt_name == 'klogd' or alt_name == 'syslogd': |
375 | d.appendVar('ALTERNATIVE_%s-syslog' % (pn), ' ' + alt_name) | ||
376 | else: | ||
377 | d.appendVar('ALTERNATIVE_%s' % (pn), ' ' + alt_name) | ||
375 | d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, alt_link_name) | 378 | d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, alt_link_name) |
376 | if os.path.exists('%s%s' % (dvar, target)): | 379 | if os.path.exists('%s%s' % (dvar, target)): |
377 | d.setVarFlag('ALTERNATIVE_TARGET', alt_name, target) | 380 | d.setVarFlag('ALTERNATIVE_TARGET', alt_name, target) |