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:33 +0000 |
commit | 3590296db70c5cf91f72d5ff92439269c89d9a8d (patch) | |
tree | e693e746ca388e708287c4d70172c5c203907031 /meta/recipes-core | |
parent | c31fde649fa428186386b4775f1106ae1a6e2527 (diff) | |
download | poky-3590296db70c5cf91f72d5ff92439269c89d9a8d.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.
(From OE-Core rev: 70a161ee88d3d54fec6d59039c181b43f1857dc3)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-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" | |||
271 | 271 | ||
272 | python do_package_prepend () { | 272 | python do_package_prepend () { |
273 | if '--enable-su' in d.getVar('EXTRA_OECONF', True).split(): | 273 | if '--enable-su' in d.getVar('EXTRA_OECONF', True).split(): |
274 | alt_name = "su" | 274 | d.appendVar(d.expand('ALTERNATIVE_${PN}'), ' su') |
275 | d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, '%s/%s' % (d.getVar('base_bindir', True), alt_name)) | 275 | d.appendVar(d.expand('ALTERNATIVE_${PN}-doc'), ' su.1') |
276 | d.appendVar('ALTERNATIVE_%s' % (d.getVar('PN', True)), ' ' + alt_name) | 276 | |
277 | d.setVarFlag('ALTERNATIVE_LINK_NAME', "su", d.expand('${base_bindir}/su')) | ||
278 | d.setVarFlag('ALTERNATIVE_LINK_NAME', "su.1", d.expand('${mandir}/man1/su.1')) | ||
277 | } | 279 | } |
278 | 280 | ||
279 | python populate_packages_prepend() { | 281 | python populate_packages_prepend() { |