From 5569e6ef3ef646fa498f59b8dae1d5d34d0bb9c3 Mon Sep 17 00:00:00 2001 From: Mike Crowe Date: Wed, 7 Mar 2018 09:17:11 +0000 Subject: util-linux: Remove kill from native install util-linux installs kill as ${base_bindir}/kill. coreutils installs kill as ${bindir}/kill. If base_bindir and bindir are the same (as they are in meta-micro) then this causes a conflict for recipes that depend on util-linux-native and coreutils-native. This means that in the unlikely event that a recipe needs to run kill during the build, it will need to depend on coreutils-native. core-image-sato built successfully for me with this change. Signed-off-by: Mike Crowe Signed-off-by: Ross Burton --- meta/recipes-core/util-linux/util-linux.inc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta/recipes-core') diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index e228bde299..5e40b2019a 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -196,8 +196,10 @@ do_install () { } # nologin causes a conflict with shadow-native +# kill causes a conflict with coreutils-native (if ${bindir}==${base_bindir}) do_install_append_class-native () { rm -f ${D}${base_sbindir}/nologin + rm -f ${D}${base_bindir}/kill } ALTERNATIVE_PRIORITY = "80" -- cgit 1.2.3-korg