summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-02-26 18:27:04 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-28 13:21:54 +0000
commit9d973d3b4ed8d2ce3c8997dc21603a0952e7ef0e (patch)
treed82567893852c0134a574f1c45ce7db7b90c2fd0 /meta/classes
parent561ff52c516990c769681446c22d516eb6b91461 (diff)
downloadpoky-9d973d3b4ed8d2ce3c8997dc21603a0952e7ef0e.tar.gz
default-distrovars: Drop DISTRO_FEATURES_LIBC
After eglibc was merged into glibc, Kconfig support was also dropped so these libc features therefore are not effective anymore and can be removed (From OE-Core rev: c62b1cc06613a4cdddf53290e6203559f43fc62d) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/image.bbclass5
-rw-r--r--meta/classes/libc-package.bbclass9
2 files changed, 3 insertions, 11 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 11927f39f5..276d0d31f4 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -176,11 +176,6 @@ IMAGE_LINGUAS ?= "de-de fr-fr en-gb"
176 176
177LINGUAS_INSTALL ?= "${@" ".join(map(lambda s: "locale-base-%s" % s, d.getVar('IMAGE_LINGUAS').split()))}" 177LINGUAS_INSTALL ?= "${@" ".join(map(lambda s: "locale-base-%s" % s, d.getVar('IMAGE_LINGUAS').split()))}"
178 178
179python () {
180 if not bb.utils.contains('DISTRO_FEATURES', 'libc-charsets libc-locale-code libc-locales', True, False, d):
181 d.setVar('IMAGE_LINGUAS', '')
182}
183
184# Prefer image, but use the fallback files for lookups if the image ones 179# Prefer image, but use the fallback files for lookups if the image ones
185# aren't yet available. 180# aren't yet available.
186PSEUDO_PASSWD = "${IMAGE_ROOTFS}:${STAGING_DIR_NATIVE}" 181PSEUDO_PASSWD = "${IMAGE_ROOTFS}:${STAGING_DIR_NATIVE}"
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index 34c9151ae9..8859dad566 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -37,14 +37,11 @@ python __anonymous () {
37 d.setVar("DEPENDS", depends) 37 d.setVar("DEPENDS", depends)
38 d.setVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", "compile") 38 d.setVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", "compile")
39 break 39 break
40
41 # try to fix disable charsets/locales/locale-code compile fail
42 if bb.utils.contains('DISTRO_FEATURES', 'libc-charsets libc-locales libc-locale-code', True, False, d):
43 d.setVar('PACKAGE_NO_GCONV', '0')
44 else:
45 d.setVar('PACKAGE_NO_GCONV', '1')
46} 40}
47 41
42# try to fix disable charsets/locales/locale-code compile fail
43PACKAGE_NO_GCONV ?= "0"
44
48OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}" 45OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
49 46
50locale_base_postinst_ontarget() { 47locale_base_postinst_ontarget() {