]> code.ossystems Code Review - openembedded-core.git/commitdiff
glibc-locale: DEPEND on virtual/libc
authorJoshua Watt <jpewhacker@gmail.com>
Thu, 30 May 2019 18:31:38 +0000 (13:31 -0500)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 31 May 2019 21:12:38 +0000 (22:12 +0100)
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.

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/glibc/glibc-locale.inc

index a985d26c75d7da3963516fa88153fb665f0d2d8c..f033635bd0d3127c16727e844f635e9887b42693 100644 (file)
@@ -12,9 +12,7 @@ BINUTILSDEP = "virtual/${MLPREFIX}${TARGET_PREFIX}binutils:do_populate_sysroot"
 BINUTILSDEP_class-nativesdk = "virtual/${TARGET_PREFIX}binutils-crosssdk:do_populate_sysroot"
 do_package[depends] += "${BINUTILSDEP}"
 
-# localedef links with libc.so and glibc-collateral.inc inhibits all default deps
-# cannot add virtual/libc to DEPENDS, because it would conflict with libc-initial in RSS
-RDEPENDS_localedef += "glibc"
+DEPENDS += "virtual/libc"
 
 # Binary locales are generated at build time if ENABLE_BINARY_LOCALE_GENERATION
 # is set. The idea is to avoid running localedef on the target (at first boot)