Patchwork [1/3] util-linux: use u-a for su

login
register
mail settings
Submitter Hongxu Jia
Date July 26, 2013, 12:09 p.m.
Message ID <097de85404b6e1a841e94a030254d449d9aafa96.1374835913.git.hongxu.jia@windriver.com>
Download mbox | patch
Permalink /patch/54581/
State Accepted
Commit 6190c69a9f78aeef951c39e4c8700e945bbec5f7
Headers show

Comments

Hongxu Jia - July 26, 2013, 12:09 p.m.
Use alternatives mechanism to prevent confliction of attempted
installing su binary among busybox, shadow and util-linux.

[YOCTO #4926]

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 meta/recipes-core/util-linux/util-linux.inc | 7 +++++++
 1 file changed, 7 insertions(+)

Patch

diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index d373cec..89bc4a8 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -218,3 +218,10 @@  ALTERNATIVE_LINK_NAME[reset] = "${bindir}/reset"
 ALTERNATIVE_TARGET[reset] = "${base_bindir}/reset"
 
 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('bindir', True), alt_name))
+        d.appendVar('ALTERNATIVE_%s' % (d.getVar('PN', True)), ' ' + alt_name)
+}