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@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 4cca897b60a86a54e471242d73dff8a579f6eba0..10b14b335afaf8f921e4efe71e27b3825b46324c 100644 (file)
--- 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"