summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glibc
diff options
context:
space:
mode:
authorJoshua Watt <jpewhacker@gmail.com>2019-05-30 13:31:38 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-31 22:13:31 +0100
commit908e847b4643f7ee7a8b552075f617e0e2ac1b5c (patch)
tree89bbd2a5e512defe626ffadf59141aff6801bb9d /meta/recipes-core/glibc
parent4babb468b856f495ef828ee21cefb266ed58bd28 (diff)
downloadpoky-908e847b4643f7ee7a8b552075f617e0e2ac1b5c.tar.gz
glibc-locale: DEPEND on virtual/libc
The restriction against glibc-locale depending on virtual/libc is removed now that libc-initial no longer exists. Adding the DEPENDS on virtual/libc fixes a race (and reproducibility issue) where the packages created by this recipe would have different runtime dependencies depending on if libc had generated its packages yet or not. (From OE-Core rev: 75539cb23073596a9f13446dd6f3921755d7fb53) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glibc')
-rw-r--r--meta/recipes-core/glibc/glibc-locale.inc4
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/recipes-core/glibc/glibc-locale.inc b/meta/recipes-core/glibc/glibc-locale.inc
index a985d26c75..f033635bd0 100644
--- a/meta/recipes-core/glibc/glibc-locale.inc
+++ b/meta/recipes-core/glibc/glibc-locale.inc
@@ -12,9 +12,7 @@ BINUTILSDEP = "virtual/${MLPREFIX}${TARGET_PREFIX}binutils:do_populate_sysroot"
12BINUTILSDEP_class-nativesdk = "virtual/${TARGET_PREFIX}binutils-crosssdk:do_populate_sysroot" 12BINUTILSDEP_class-nativesdk = "virtual/${TARGET_PREFIX}binutils-crosssdk:do_populate_sysroot"
13do_package[depends] += "${BINUTILSDEP}" 13do_package[depends] += "${BINUTILSDEP}"
14 14
15# localedef links with libc.so and glibc-collateral.inc inhibits all default deps 15DEPENDS += "virtual/libc"
16# cannot add virtual/libc to DEPENDS, because it would conflict with libc-initial in RSS
17RDEPENDS_localedef += "glibc"
18 16
19# Binary locales are generated at build time if ENABLE_BINARY_LOCALE_GENERATION 17# Binary locales are generated at build time if ENABLE_BINARY_LOCALE_GENERATION
20# is set. The idea is to avoid running localedef on the target (at first boot) 18# is set. The idea is to avoid running localedef on the target (at first boot)