From 56d49ee48f47ea05de26a7e922597413f81b2122 Mon Sep 17 00:00:00 2001 From: Caner Altinbasak Date: Fri, 20 Mar 2015 08:16:36 -0600 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-core/util-linux/util-linux.inc | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'meta') diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 4cca897b60..10b14b335a 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" -- cgit 1.2.3-korg