summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-04-10 18:33:46 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-11 12:12:43 +0100
commit88b399bb2c8adcf8563d144c0838cbcdd45c0694 (patch)
treef72f92b1d1a8bbd65be3a69bb183812efc1256d2
parent6abc4c46fdf767d986a8c10283a7b08f4f8b58c9 (diff)
downloadpoky-88b399bb2c8adcf8563d144c0838cbcdd45c0694.tar.gz
poky-88b399bb2c8adcf8563d144c0838cbcdd45c0694.tar.bz2
poky-88b399bb2c8adcf8563d144c0838cbcdd45c0694.zip
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>
-rw-r--r--meta/conf/distro/include/tclibc-eglibc.inc23
-rw-r--r--meta/recipes-core/tasks/task-core-standalone-sdk-target.bb2
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 \
eglibc-dev \
eglibc-utils \
eglibc-thread-db \
- eglibc-localedata-i18n \
- eglibc-gconv-ibm850 \
- eglibc-gconv-cp1252 \
- eglibc-gconv-iso8859-1 \
- eglibc-gconv-iso8859-15 \
- locale-base-en-us \
- locale-base-en-gb "
+ ${@get_libc_locales_dependencies(d)}"
+
+LIBC_LOCALE_DEPENDENCIES = "\
+ eglibc-localedata-i18n \
+ eglibc-gconv-ibm850 \
+ eglibc-gconv-cp1252 \
+ eglibc-gconv-iso8859-1 \
+ eglibc-gconv-iso8859-15 \
+ locale-base-en-us \
+ locale-base-en-gb"
+
+def get_libc_locales_dependencies(d):
+ if 'libc-locales' in (d.getVar('DISTRO_FEATURES', True) or '').split() :
+ return d.getVar('LIBC_LOCALE_DEPENDENCIES', True) or ''
+ else:
+ 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 @@
DESCRIPTION = "Target packages for the standalone SDK"
-PR = "r6"
+PR = "r7"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"