diff options
| author |   Ross Burton <ross.burton@intel.com> | 2016-11-01 14:50:35 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-06 23:35:17 +0000 |
| commit | 70a161ee88d3d54fec6d59039c181b43f1857dc3 (patch) | |
| tree | 09784349e641e360042b71db39fe878195b8d5df | |
| parent | 9f4a85eb929f67420d9689d7dddadd120ed49843 (diff) | |
| download | openembedded-core-contrib-70a161ee88d3d54fec6d59039c181b43f1857dc3.tar.gz | |
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.
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | 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 c6355021fc..70cba6b592 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() { |