[oe-commits] [openembedded-core] 01/49: busybox: Put klogd/syslogd alternative links in syslog package

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch sumo
in repository openembedded-core.

commit a0afcd457af14c3bf3a74514be0e8a029a4fcf63
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Wed Sep 5 17:39:31 2018 +0100

    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 at linuxfoundation.org>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta/recipes-core/busybox/busybox.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index f1b09d9..c8919ce 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -368,7 +368,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)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.