summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-01-31 00:54:07 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-08 08:00:29 +0000
commit90ca8d537ea28469affbe11fd96fc8c0fcd5a2a0 (patch)
tree345af9918eaf1e8bd4a1aaeb7a923b5b472c9929
parent9171652af20ae620ec25ddb73b6c2d90ff0f4f51 (diff)
downloadpoky-90ca8d537ea28469affbe11fd96fc8c0fcd5a2a0.tar.gz
coreutils 6.9: disable native
ERROR: The recipe coreutils-native is trying to install files into a shared area when those files already exist. Those files and their manifest location are: tmp/sysroots/x86_64-linux/bin/kill Matched in manifest-x86_64-util-linux-native.populate_sysroot We have 8.23, so disable it rather than fix. (From OE-Core rev: da6fbea919bd460a30423b16c48b79047d6c6030) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/coreutils/coreutils_6.9.bb12
1 files changed, 3 insertions, 9 deletions
diff --git a/meta/recipes-core/coreutils/coreutils_6.9.bb b/meta/recipes-core/coreutils/coreutils_6.9.bb
index debd2a123b..7f34e1b73c 100644
--- a/meta/recipes-core/coreutils/coreutils_6.9.bb
+++ b/meta/recipes-core/coreutils/coreutils_6.9.bb
@@ -9,11 +9,10 @@ LICENSE = "GPLv2+"
9LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ 9LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
10 file://src/ls.c;beginline=4;endline=16;md5=15ed60f67b1db5fedd5dbc37cf8a9543" 10 file://src/ls.c;beginline=4;endline=16;md5=15ed60f67b1db5fedd5dbc37cf8a9543"
11PR = "r5" 11PR = "r5"
12DEPENDS_class-native = "gettext-native"
13 12
14inherit autotools gettext texinfo 13inherit autotools gettext texinfo
15 14
16SRC_URI_BASE = "${GNU_MIRROR}/coreutils/${BP}.tar.bz2 \ 15SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.bz2 \
17 file://gnulib_m4.patch \ 16 file://gnulib_m4.patch \
18 file://futimens.patch \ 17 file://futimens.patch \
19 file://coreutils-ls-x.patch \ 18 file://coreutils-ls-x.patch \
@@ -25,19 +24,16 @@ SRC_URI_BASE = "${GNU_MIRROR}/coreutils/${BP}.tar.bz2 \
25 file://coreutils_fix_for_automake-1.12.patch \ 24 file://coreutils_fix_for_automake-1.12.patch \
26 file://coreutils-build-with-acl.patch \ 25 file://coreutils-build-with-acl.patch \
27 file://coreutils-fix-texinfo.patch \ 26 file://coreutils-fix-texinfo.patch \
27 file://fix_for_manpage_building.patch \
28 " 28 "
29 29
30SRC_URI = "${SRC_URI_BASE} file://fix_for_manpage_building.patch"
31SRC_URI_class-native = "${SRC_URI_BASE}"
32
33SRC_URI[md5sum] = "c9607d8495f16e98906e7ed2d9751a06" 30SRC_URI[md5sum] = "c9607d8495f16e98906e7ed2d9751a06"
34SRC_URI[sha256sum] = "89c2895ad157de50e53298b22d91db116ee4e1dd3fdf4019260254e2e31497b0" 31SRC_URI[sha256sum] = "89c2895ad157de50e53298b22d91db116ee4e1dd3fdf4019260254e2e31497b0"
35 32
36 33
37# acl is not a default feature 34# acl is not a default feature
38# 35#
39PACKAGECONFIG_class-target ??= "${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}" 36PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}"
40PACKAGECONFIG_class-native ??= ""
41 37
42# with, without, depends, rdepends 38# with, without, depends, rdepends
43# 39#
@@ -102,5 +98,3 @@ python __anonymous() {
102 for prog in d.getVar('sbindir_progs', True).split(): 98 for prog in d.getVar('sbindir_progs', True).split():
103 d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('sbindir', True), prog)) 99 d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('sbindir', True), prog))
104} 100}
105
106BBCLASSEXTEND = "native"