diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2012-04-10 18:33:46 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-11 12:12:43 +0100 |
commit | 88b399bb2c8adcf8563d144c0838cbcdd45c0694 (patch) | |
tree | f72f92b1d1a8bbd65be3a69bb183812efc1256d2 /meta | |
parent | 6abc4c46fdf767d986a8c10283a7b08f4f8b58c9 (diff) | |
download | poky-88b399bb2c8adcf8563d144c0838cbcdd45c0694.tar.gz |
tclibc-eglibc.inc: make locale packages dependency conditional
Only add locale package dependencies if the eglibc is configured
with locale support.
This avoids dependencies issues for distros such as poky-tiny
[RP: Add PR bump]
(From OE-Core rev: bcaea8ec9c9c333f76b368225f60d4fb54c1c7b2)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/conf/distro/include/tclibc-eglibc.inc | 23 | ||||
-rw-r--r-- | meta/recipes-core/tasks/task-core-standalone-sdk-target.bb | 2 |
2 files changed, 17 insertions, 8 deletions
diff --git a/meta/conf/distro/include/tclibc-eglibc.inc b/meta/conf/distro/include/tclibc-eglibc.inc index 8b8a214132..aed82d1870 100644 --- a/meta/conf/distro/include/tclibc-eglibc.inc +++ b/meta/conf/distro/include/tclibc-eglibc.inc | |||
@@ -23,10 +23,19 @@ LIBC_DEPENDENCIES = "libsegfault \ | |||
23 | eglibc-dev \ | 23 | eglibc-dev \ |
24 | eglibc-utils \ | 24 | eglibc-utils \ |
25 | eglibc-thread-db \ | 25 | eglibc-thread-db \ |
26 | eglibc-localedata-i18n \ | 26 | ${@get_libc_locales_dependencies(d)}" |
27 | eglibc-gconv-ibm850 \ | 27 | |
28 | eglibc-gconv-cp1252 \ | 28 | LIBC_LOCALE_DEPENDENCIES = "\ |
29 | eglibc-gconv-iso8859-1 \ | 29 | eglibc-localedata-i18n \ |
30 | eglibc-gconv-iso8859-15 \ | 30 | eglibc-gconv-ibm850 \ |
31 | locale-base-en-us \ | 31 | eglibc-gconv-cp1252 \ |
32 | locale-base-en-gb " | 32 | eglibc-gconv-iso8859-1 \ |
33 | eglibc-gconv-iso8859-15 \ | ||
34 | locale-base-en-us \ | ||
35 | locale-base-en-gb" | ||
36 | |||
37 | def get_libc_locales_dependencies(d): | ||
38 | if 'libc-locales' in (d.getVar('DISTRO_FEATURES', True) or '').split() : | ||
39 | return d.getVar('LIBC_LOCALE_DEPENDENCIES', True) or '' | ||
40 | else: | ||
41 | return '' | ||
diff --git a/meta/recipes-core/tasks/task-core-standalone-sdk-target.bb b/meta/recipes-core/tasks/task-core-standalone-sdk-target.bb index 3835ac7d6a..03628a167d 100644 --- a/meta/recipes-core/tasks/task-core-standalone-sdk-target.bb +++ b/meta/recipes-core/tasks/task-core-standalone-sdk-target.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | DESCRIPTION = "Target packages for the standalone SDK" | 1 | DESCRIPTION = "Target packages for the standalone SDK" |
2 | PR = "r6" | 2 | PR = "r7" |
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ | 4 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ |
5 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 5 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |