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 <mac@mcrowe.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index e228bde299c50220ed27f6439e9af405cdaacd92..5e40b2019a41cc40c24dc6cded44acb7179505ef 100644 (file)
--- 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"