summaryrefslogtreecommitdiffstats
path: root/meta/conf/distro
diff options
context:
space:
mode:
Diffstat (limited to 'meta/conf/distro')
-rw-r--r--meta/conf/distro/include/default-distrovars.inc13
-rw-r--r--meta/conf/distro/include/tclibc-glibc.inc19
2 files changed, 7 insertions, 25 deletions
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
index 76edff6480..7a0baf3260 100644
--- a/meta/conf/distro/include/default-distrovars.inc
+++ b/meta/conf/distro/include/default-distrovars.inc
@@ -10,17 +10,8 @@ LOCALE_UTF8_ONLY ?= "0"
10LOCALE_UTF8_IS_DEFAULT ?= "1" 10LOCALE_UTF8_IS_DEFAULT ?= "1"
11LOCALE_UTF8_IS_DEFAULT_class-nativesdk = "0" 11LOCALE_UTF8_IS_DEFAULT_class-nativesdk = "0"
12 12
13DISTRO_FEATURES_DEFAULT ?= "acl alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc x11" 13DISTRO_FEATURES_DEFAULT ?= "acl alsa argp bluetooth ext2 ipv4 ipv6 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc x11"
14DISTRO_FEATURES_LIBC_DEFAULT ?= "ipv4 ipv6 libc-backtrace libc-big-macros libc-bsd libc-cxx-tests libc-catgets libc-charsets libc-crypt \ 14DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT}"
15 libc-crypt-ufc libc-db-aliases libc-envz libc-fcvt libc-fmtmsg libc-fstab libc-ftraverse \
16 libc-getlogin libc-idn libc-inet-anl libc-libm libc-locales libc-locale-code \
17 libc-memusage libc-nsswitch libc-rcmd libc-rtld-debug libc-spawn libc-streams \
18 libc-utmp libc-utmpx libc-wordexp libc-posix-clang-wchar libc-posix-regexp libc-posix-regexp-glibc \
19 libc-posix-wchar-io"
20DISTRO_FEATURES_LIBC ?= "${DISTRO_FEATURES_LIBC_DEFAULT}"
21DISTRO_FEATURES_LIBC_class-nativesdk = "${DISTRO_FEATURES_LIBC_DEFAULT}"
22DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC}"
23
24IMAGE_FEATURES ?= "" 15IMAGE_FEATURES ?= ""
25 16
26WHITELIST_GPL-3.0 ?= "" 17WHITELIST_GPL-3.0 ?= ""
diff --git a/meta/conf/distro/include/tclibc-glibc.inc b/meta/conf/distro/include/tclibc-glibc.inc
index abe619aaac..3246490997 100644
--- a/meta/conf/distro/include/tclibc-glibc.inc
+++ b/meta/conf/distro/include/tclibc-glibc.inc
@@ -22,17 +22,8 @@ LIBC_DEPENDENCIES = "libsegfault \
22 glibc-dev \ 22 glibc-dev \
23 glibc-utils \ 23 glibc-utils \
24 glibc-thread-db \ 24 glibc-thread-db \
25 ${@get_libc_locales_dependencies(d)}" 25 glibc-localedata-i18n \
26 26 glibc-gconv-ibm850 \
27LIBC_LOCALE_DEPENDENCIES = "\ 27 glibc-gconv-cp1252 \
28 glibc-localedata-i18n \ 28 glibc-gconv-iso8859-1 \
29 glibc-gconv-ibm850 \ 29 glibc-gconv-iso8859-15"
30 glibc-gconv-cp1252 \
31 glibc-gconv-iso8859-1 \
32 glibc-gconv-iso8859-15"
33
34def get_libc_locales_dependencies(d):
35 if bb.utils.contains('DISTRO_FEATURES', 'libc-charsets libc-locale-code libc-locales', True, False, d):
36 return d.getVar('LIBC_LOCALE_DEPENDENCIES') or ''
37 else:
38 return ''