[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3233/8267] util-linux: add su.1 to update-alternatives

[Emmanuele Bassi <ebassi src gnome org>]

commit 3590296db70c5cf91f72d5ff92439269c89d9a8d
Author: Ross Burton <ross burton intel com>
Date:   Tue Nov 1 14:50:35 2016 +0000

    util-linux: add su.1 to update-alternatives
    
    The su binary is handled by alternatives but the man page wasn't, so
    installing both util-linux-doc and shadow-doc produces errors.
    
    Also use d.expand() to neaten the code.
    
    (From OE-Core rev: 70a161ee88d3d54fec6d59039c181b43f1857dc3)
    
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-core/util-linux/util-linux.inc |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index c635502..70cba6b 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -271,9 +271,11 @@ BBCLASSEXTEND = "native nativesdk"
 
 python do_package_prepend () {
     if '--enable-su' in d.getVar('EXTRA_OECONF', True).split():
-        alt_name = "su"
-        d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, '%s/%s' % (d.getVar('base_bindir', True), alt_name))
-        d.appendVar('ALTERNATIVE_%s' % (d.getVar('PN', True)), ' ' + alt_name)
+        d.appendVar(d.expand('ALTERNATIVE_${PN}'), ' su')
+        d.appendVar(d.expand('ALTERNATIVE_${PN}-doc'), ' su.1')
+
+        d.setVarFlag('ALTERNATIVE_LINK_NAME', "su", d.expand('${base_bindir}/su'))
+        d.setVarFlag('ALTERNATIVE_LINK_NAME', "su.1", d.expand('${mandir}/man1/su.1'))
 }
 
 python populate_packages_prepend() {