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:39:32 -0800 |
commit | f1318b0421a4b8da0c08044cdce826de5f5a8cb7 (patch) | |
tree | 98f091aa7f5b99ec440f5cbe51ae04b704970ffe /meta/recipes-core | |
parent | 8715b5f3119d00f0b7c1d2025af6c56e9b45e2a2 (diff) | |
download | poky-f1318b0421a4b8da0c08044cdce826de5f5a8cb7.tar.gz |
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.
(From OE-Core rev: 5569e6ef3ef646fa498f59b8dae1d5d34d0bb9c3)
Signed-off-by: Mike Crowe <mac@mcrowe.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-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 () { | |||
196 | } | 196 | } |
197 | 197 | ||
198 | # nologin causes a conflict with shadow-native | 198 | # nologin causes a conflict with shadow-native |
199 | # kill causes a conflict with coreutils-native (if ${bindir}==${base_bindir}) | ||
199 | do_install_append_class-native () { | 200 | do_install_append_class-native () { |
200 | rm -f ${D}${base_sbindir}/nologin | 201 | rm -f ${D}${base_sbindir}/nologin |
202 | rm -f ${D}${base_bindir}/kill | ||
201 | } | 203 | } |
202 | 204 | ||
203 | ALTERNATIVE_PRIORITY = "80" | 205 | ALTERNATIVE_PRIORITY = "80" |