[PATCH] glibc-locale: DEPEND on virtual/libc

[PATCH] glibc-locale: DEPEND on virtual/libc

[Joshua Watt]

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>
---
 meta/recipes-core/glibc/glibc-locale.inc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/meta/recipes-core/glibc/glibc-locale.inc b/meta/recipes-core/glibc/glibc-locale.inc
index a985d26c75d..f033635bd0d 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"
 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)
-- 
2.21.0

Re: [PATCH] glibc-locale: DEPEND on virtual/libc

[Khem Raj]

On Thu, May 30, 2019 at 8:31 PM Joshua Watt <jpewhacker@gmail.com> wrote:
>
> 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.

technically locales are intertwined with glibc so it does not matter
but I understand the dependency race point
so lets take it in


>
> Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
> ---
>  meta/recipes-core/glibc/glibc-locale.inc | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/meta/recipes-core/glibc/glibc-locale.inc b/meta/recipes-core/glibc/glibc-locale.inc
> index a985d26c75d..f033635bd0d 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"
>  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)
> --
> 2.21.0
>