diff options
author | Caner Altinbasak <caner.altinbasak@gmail.com> | 2015-03-20 08:16:36 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-21 09:42:39 +0000 |
commit | 56d49ee48f47ea05de26a7e922597413f81b2122 (patch) | |
tree | d19f52c17dda1a34b63997b3ee31936157d3560f | |
parent | 9d5deedfdae28d0257e84e1980c2cb7fd4e38c45 (diff) | |
download | openembedded-core-56d49ee48f47ea05de26a7e922597413f81b2122.tar.gz openembedded-core-56d49ee48f47ea05de26a7e922597413f81b2122.tar.bz2 openembedded-core-56d49ee48f47ea05de26a7e922597413f81b2122.zip |
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>
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 6 |
1 files changed, 6 insertions, 0 deletions
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" |