diff options
| author | Mike Crowe <mac@mcrowe.com> | 2018-03-07 09:17:11 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-08 10:31:57 -0800 |
| commit | 5569e6ef3ef646fa498f59b8dae1d5d34d0bb9c3 (patch) | |
| tree | ec8fecf6efaa48ab839ad63126b4784a5dc42d49 | |
| parent | cdf16bb9751603fdb0340c03ef43f193918d31df (diff) | |
| download | openembedded-core-5569e6ef3ef646fa498f59b8dae1d5d34d0bb9c3.tar.gz openembedded-core-5569e6ef3ef646fa498f59b8dae1d5d34d0bb9c3.tar.bz2 openembedded-core-5569e6ef3ef646fa498f59b8dae1d5d34d0bb9c3.zip | |
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>
| -rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 2 |
1 files changed, 2 insertions, 0 deletions
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" |