[14/18] libxcrypt: Provide virtual/crypt for target and native as well

Message ID 0872912754137df00107c4736b6bf7bea80fdd34.1533595822.git.raj.khem@gmail.com
State Superseded
Headers show
Series
  • Update to glibc 2.28
Related show

Commit Message

Khem Raj Aug. 6, 2018, 10:57 p.m.
virtual/crypt for musl will come from libc itself

Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
 meta/conf/distro/include/tclibc-musl.inc       | 1 +
 meta/recipes-core/libxcrypt/libxcrypt_4.0.1.bb | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

-- 
2.18.0

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/conf/distro/include/tclibc-musl.inc b/meta/conf/distro/include/tclibc-musl.inc
index 052ae0e23b..8badbbb40a 100644
--- a/meta/conf/distro/include/tclibc-musl.inc
+++ b/meta/conf/distro/include/tclibc-musl.inc
@@ -9,6 +9,7 @@  LIBCOVERRIDE = ":libc-musl"
 PREFERRED_PROVIDER_virtual/libc ?= "musl"
 PREFERRED_PROVIDER_virtual/libiconv ?= "musl"
 PREFERRED_PROVIDER_virtual/libintl ?= "musl"
+PREFERRED_PROVIDER_virtual/crypt ?= "musl"
 PREFERRED_PROVIDER_virtual/nativesdk-libintl ?= "nativesdk-glibc"
 PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-glibc"
 
diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.0.1.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.0.1.bb
index 6ed67a6761..f21029cdad 100644
--- a/meta/recipes-core/libxcrypt/libxcrypt_4.0.1.bb
+++ b/meta/recipes-core/libxcrypt/libxcrypt_4.0.1.bb
@@ -24,9 +24,4 @@  S = "${WORKDIR}/git"
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE} -std=gnu99"
 TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}"
 
-python () {
-    if not bb.data.inherits_class('nativesdk', d):
-        raise bb.parse.SkipRecipe("Recipe only applies in nativesdk case for now")
-}
-
 BBCLASSEXTEND = "nativesdk"