diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-locale.inc | 6 | ||||
-rw-r--r-- | meta/recipes-core/glibc/glibc-locale_2.10.1.bb | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc index ed6c099c6c..7c4b1d501d 100644 --- a/meta/recipes-core/eglibc/eglibc-locale.inc +++ b/meta/recipes-core/eglibc/eglibc-locale.inc | |||
@@ -26,12 +26,12 @@ BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips" | |||
26 | # set "0" for qemu emulation of native localedef for locale generation | 26 | # set "0" for qemu emulation of native localedef for locale generation |
27 | LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1" | 27 | LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1" |
28 | 28 | ||
29 | PR = "r0" | 29 | PR = "r1" |
30 | 30 | ||
31 | PKGSUFFIX = "" | 31 | PKGSUFFIX = "" |
32 | PKGSUFFIX_virtclass-nativesdk = "-nativesdk" | 32 | PKGSUFFIX_virtclass-nativesdk = "-nativesdk" |
33 | 33 | ||
34 | PACKAGES = "eglibc-locale localedef${PKGSUFFIX}" | 34 | PACKAGES = "localedef${PKGSUFFIX}" |
35 | 35 | ||
36 | PACKAGES_DYNAMIC = "locale-base-* \ | 36 | PACKAGES_DYNAMIC = "locale-base-* \ |
37 | eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* \ | 37 | eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* \ |
@@ -39,8 +39,6 @@ PACKAGES_DYNAMIC = "locale-base-* \ | |||
39 | 39 | ||
40 | PROVIDES = "virtual/libc-locale${PKGSUFFIX}" | 40 | PROVIDES = "virtual/libc-locale${PKGSUFFIX}" |
41 | 41 | ||
42 | RPROVIDES_eglibc-locale = "glibc-locale" | ||
43 | |||
44 | FILES_eglibc-gconv = "${libdir}/gconv/*" | 42 | FILES_eglibc-gconv = "${libdir}/gconv/*" |
45 | FILES_localedef${PKGSUFFIX} = "${bindir}/localedef" | 43 | FILES_localedef${PKGSUFFIX} = "${bindir}/localedef" |
46 | 44 | ||
diff --git a/meta/recipes-core/glibc/glibc-locale_2.10.1.bb b/meta/recipes-core/glibc/glibc-locale_2.10.1.bb index d8ff12d274..60825397a5 100644 --- a/meta/recipes-core/glibc/glibc-locale_2.10.1.bb +++ b/meta/recipes-core/glibc/glibc-locale_2.10.1.bb | |||
@@ -26,14 +26,14 @@ BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips" | |||
26 | # set "0" for qemu emulation of native localedef for locale generation | 26 | # set "0" for qemu emulation of native localedef for locale generation |
27 | LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1" | 27 | LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1" |
28 | 28 | ||
29 | PR = "r0" | 29 | PR = "r1" |
30 | 30 | ||
31 | PKGSUFFIX = "" | 31 | PKGSUFFIX = "" |
32 | PKGSUFFIX_virtclass-nativesdk = "-nativesdk" | 32 | PKGSUFFIX_virtclass-nativesdk = "-nativesdk" |
33 | 33 | ||
34 | PROVIDES = "virtual/libc-locale" | 34 | PROVIDES = "virtual/libc-locale" |
35 | 35 | ||
36 | PACKAGES = "glibc-locale localedef${PKGSUFFIX}" | 36 | PACKAGES = "localedef${PKGSUFFIX}" |
37 | 37 | ||
38 | PACKAGES_DYNAMIC = "locale-base-* \ | 38 | PACKAGES_DYNAMIC = "locale-base-* \ |
39 | glibc-gconv-*${PKGSUFFIX} glibc-charmap-* glibc-localedata-* glibc-binary-localedata-*" | 39 | glibc-gconv-*${PKGSUFFIX} glibc-charmap-* glibc-localedata-* glibc-binary-localedata-*" |