diff options
Diffstat (limited to 'meta/conf/distro')
-rw-r--r-- | meta/conf/distro/defaultsetup.conf | 2 | ||||
-rw-r--r-- | meta/conf/distro/include/tclibc-glibc.inc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf index aa21345a1c..1055b9bb93 100644 --- a/meta/conf/distro/defaultsetup.conf +++ b/meta/conf/distro/defaultsetup.conf | |||
@@ -15,7 +15,7 @@ require conf/distro/include/uninative-flags.inc | |||
15 | TCLIBCAPPEND ?= "-${TCLIBC}" | 15 | TCLIBCAPPEND ?= "-${TCLIBC}" |
16 | TMPDIR .= "${TCLIBCAPPEND}" | 16 | TMPDIR .= "${TCLIBCAPPEND}" |
17 | 17 | ||
18 | CACHE = "${TMPDIR}/cache/${TCMODE}-${TCLIBC}${@['', '/' + str(d.getVar('MACHINE', True))][bool(d.getVar('MACHINE', True))]}${@['', '/' + str(d.getVar('SDKMACHINE', True))][bool(d.getVar('SDKMACHINE', True))]}" | 18 | CACHE = "${TMPDIR}/cache/${TCMODE}-${TCLIBC}${@['', '/' + str(d.getVar('MACHINE'))][bool(d.getVar('MACHINE'))]}${@['', '/' + str(d.getVar('SDKMACHINE'))][bool(d.getVar('SDKMACHINE'))]}" |
19 | 19 | ||
20 | USER_CLASSES ?= "" | 20 | USER_CLASSES ?= "" |
21 | PACKAGE_CLASSES ?= "package_ipk" | 21 | PACKAGE_CLASSES ?= "package_ipk" |
diff --git a/meta/conf/distro/include/tclibc-glibc.inc b/meta/conf/distro/include/tclibc-glibc.inc index 649918fd2b..ad8000f5de 100644 --- a/meta/conf/distro/include/tclibc-glibc.inc +++ b/meta/conf/distro/include/tclibc-glibc.inc | |||
@@ -2,7 +2,7 @@ | |||
2 | # glibc specific configuration | 2 | # glibc specific configuration |
3 | # | 3 | # |
4 | 4 | ||
5 | LIBCEXTENSION = "${@['', '-gnu'][(d.getVar('ABIEXTENSION', True) or '') != '']}" | 5 | LIBCEXTENSION = "${@['', '-gnu'][(d.getVar('ABIEXTENSION') or '') != '']}" |
6 | 6 | ||
7 | # Add glibc overrides to the overrides for glibc. | 7 | # Add glibc overrides to the overrides for glibc. |
8 | LIBCOVERRIDE = ":libc-glibc" | 8 | LIBCOVERRIDE = ":libc-glibc" |
@@ -34,7 +34,7 @@ LIBC_LOCALE_DEPENDENCIES = "\ | |||
34 | glibc-gconv-iso8859-15" | 34 | glibc-gconv-iso8859-15" |
35 | 35 | ||
36 | def get_libc_locales_dependencies(d): | 36 | def get_libc_locales_dependencies(d): |
37 | if 'libc-locales' in (d.getVar('DISTRO_FEATURES', True) or '').split() : | 37 | if 'libc-locales' in (d.getVar('DISTRO_FEATURES') or '').split() : |
38 | return d.getVar('LIBC_LOCALE_DEPENDENCIES', True) or '' | 38 | return d.getVar('LIBC_LOCALE_DEPENDENCIES') or '' |
39 | else: | 39 | else: |
40 | return '' | 40 | return '' |