summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Larson <kergoth@gmail.com>2012-04-27 17:39:12 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-03 15:48:03 +0100
commitb9918a31cea3e3f831330c28fa3faee978048c75 (patch)
tree70a49c805f852537087463a3bd569acf03c14bbb
parent1fbde9091f149b9c22e86390fa7cf4fbbbc3649f (diff)
downloadpoky-b9918a31cea3e3f831330c28fa3faee978048c75.tar.gz
tclibc-eglibc: drop hardcoded locale-base-en-us/en-gb
This is handled by IMAGE_LINGUAS, so hardcoding it here is at best unnecessary duplication. (From OE-Core rev: 7808c7ee9277170fbfb22bcf0575285174c2718a) Signed-off-by: Christopher Larson <kergoth@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/distro/include/tclibc-eglibc.inc12
1 files changed, 5 insertions, 7 deletions
diff --git a/meta/conf/distro/include/tclibc-eglibc.inc b/meta/conf/distro/include/tclibc-eglibc.inc
index aed82d1870..4f5607f226 100644
--- a/meta/conf/distro/include/tclibc-eglibc.inc
+++ b/meta/conf/distro/include/tclibc-eglibc.inc
@@ -19,10 +19,10 @@ CXXFLAGS += "-fvisibility-inlines-hidden"
19 19
20LIBC_DEPENDENCIES = "libsegfault \ 20LIBC_DEPENDENCIES = "libsegfault \
21 eglibc \ 21 eglibc \
22 eglibc-dbg \ 22 eglibc-dbg \
23 eglibc-dev \ 23 eglibc-dev \
24 eglibc-utils \ 24 eglibc-utils \
25 eglibc-thread-db \ 25 eglibc-thread-db \
26 ${@get_libc_locales_dependencies(d)}" 26 ${@get_libc_locales_dependencies(d)}"
27 27
28LIBC_LOCALE_DEPENDENCIES = "\ 28LIBC_LOCALE_DEPENDENCIES = "\
@@ -30,9 +30,7 @@ LIBC_LOCALE_DEPENDENCIES = "\
30 eglibc-gconv-ibm850 \ 30 eglibc-gconv-ibm850 \
31 eglibc-gconv-cp1252 \ 31 eglibc-gconv-cp1252 \
32 eglibc-gconv-iso8859-1 \ 32 eglibc-gconv-iso8859-1 \
33 eglibc-gconv-iso8859-15 \ 33 eglibc-gconv-iso8859-15"
34 locale-base-en-us \
35 locale-base-en-gb"
36 34
37def get_libc_locales_dependencies(d): 35def get_libc_locales_dependencies(d):
38 if 'libc-locales' in (d.getVar('DISTRO_FEATURES', True) or '').split() : 36 if 'libc-locales' in (d.getVar('DISTRO_FEATURES', True) or '').split() :