[oe-commits] Caner Altinbasak : util-linux-native: Fixed conflicts with shadow-native and ncurses-native

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 56d49ee48f47ea05de26a7e922597413f81b2122
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=56d49ee48f47ea05de26a7e922597413f81b2122

Author: Caner Altinbasak <caner.altinbasak at gmail.com>
Date:   Fri Mar 20 08:16:36 2015 -0600

util-linux-native: Fixed conflicts with shadow-native and ncurses-native

    util-linux-native provides /bin/reset and /sbin/nologin. shadow-native
    provides /sbin/nologin and ncurses-native provides /bin/reset. This
    creates a conlict.

    [YOCTO #7484]

    This commit fixes the conflict by deleting the /bin/reset and
    /sbin/nologin from util-linux-native installation.

    Signed-off-by: Caner Altinbasak <caner.altinbasak at gmail.com>

Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-core/util-linux/util-linux.inc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 4cca897..10b14b3 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -163,6 +163,12 @@ do_install () {
 	rm -f ${D}${bindir}/chkdupexe
 }
 
+# reset and nologin causes a conflict with ncurses-native and shadow-native
+do_install_append_class-native () {
+	rm -f ${D}${base_bindir}/reset
+	rm -f ${D}${base_sbindir}/nologin
+}
+
 ALTERNATIVE_PRIORITY = "100"
 
 ALTERNATIVE_${PN}  = "dmesg kill more mkswap blockdev pivot_root switch_root"