summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorCaner Altinbasak <caner.altinbasak@gmail.com>2015-03-20 08:16:36 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-22 08:49:58 +0000
commit3aad5e01cc3a5292d4f28a25e06ac815d77c2e08 (patch)
treef5cfbd37f59b94a26453d39b24060c10b7ca045f /meta
parentb0b8f47e993de167ab4c2f433d35bfba96e6477f (diff)
downloadpoky-3aad5e01cc3a5292d4f28a25e06ac815d77c2e08.tar.gz
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> (From OE-Core rev: 56d49ee48f47ea05de26a7e922597413f81b2122) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc6
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 () {
163 rm -f ${D}${bindir}/chkdupexe 163 rm -f ${D}${bindir}/chkdupexe
164} 164}
165 165
166# reset and nologin causes a conflict with ncurses-native and shadow-native
167do_install_append_class-native () {
168 rm -f ${D}${base_bindir}/reset
169 rm -f ${D}${base_sbindir}/nologin
170}
171
166ALTERNATIVE_PRIORITY = "100" 172ALTERNATIVE_PRIORITY = "100"
167 173
168ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root switch_root" 174ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root switch_root"