diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-05 17:39:31 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-25 22:27:45 +0000 |
commit | 0e75b95e009ded30eb53abb26ec08775216255f3 (patch) | |
tree | 90cc6cc38d807c0689ffb9f95eff3bc09d0264c2 /meta | |
parent | 7c3899304b1147363c3a8b7013460517e42fe923 (diff) | |
download | poky-0e75b95e009ded30eb53abb26ec08775216255f3.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)
(From OE-Core rev: a0afcd457af14c3bf3a74514be0e8a029a4fcf63)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 f1b09d95ce..c8919ce2c8 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc | |||
@@ -368,7 +368,10 @@ python do_package_prepend () { | |||
368 | # Match coreutils | 368 | # Match coreutils |
369 | if alt_name == '[': | 369 | if alt_name == '[': |
370 | alt_name = 'lbracket' | 370 | alt_name = 'lbracket' |
371 | d.appendVar('ALTERNATIVE_%s' % (pn), ' ' + alt_name) | 371 | if alt_name == 'klogd' or alt_name == 'syslogd': |
372 | d.appendVar('ALTERNATIVE_%s-syslog' % (pn), ' ' + alt_name) | ||
373 | else: | ||
374 | d.appendVar('ALTERNATIVE_%s' % (pn), ' ' + alt_name) | ||
372 | d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, alt_link_name) | 375 | d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, alt_link_name) |
373 | if os.path.exists('%s%s' % (dvar, target)): | 376 | if os.path.exists('%s%s' % (dvar, target)): |
374 | d.setVarFlag('ALTERNATIVE_TARGET', alt_name, target) | 377 | d.setVarFlag('ALTERNATIVE_TARGET', alt_name, target) |