From fe30c40a492c80865b0de8226366ab4cbc2c8137 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 6 Dec 2019 19:09:45 +0100 Subject: libxcrypt: update to 4.4.10 (From OE-Core rev: 548d9fefef024a2f8e323dade8456396f982f637) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.10.bb | 18 ++++++++++++++++++ meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.8.bb | 18 ------------------ meta/recipes-core/libxcrypt/libxcrypt.inc | 2 +- meta/recipes-core/libxcrypt/libxcrypt_4.4.10.bb | 2 ++ meta/recipes-core/libxcrypt/libxcrypt_4.4.8.bb | 1 - 5 files changed, 21 insertions(+), 20 deletions(-) create mode 100644 meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.10.bb delete mode 100644 meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.8.bb create mode 100644 meta/recipes-core/libxcrypt/libxcrypt_4.4.10.bb delete mode 100644 meta/recipes-core/libxcrypt/libxcrypt_4.4.8.bb (limited to 'meta') diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.10.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.10.bb new file mode 100644 index 0000000000..ba74eb1f94 --- /dev/null +++ b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.10.bb @@ -0,0 +1,18 @@ +# +# This provides libcrypto.so.1 which contains obsolete APIs, needed for uninative in particular +# + +require libxcrypt.inc + +PROVIDES = "" +AUTO_LIBNAME_PKGS = "" +EXCLUDE_FROM_WORLD = "1" + +API = "--enable-obsolete-api" + +do_install_append () { + rm -rf ${D}${includedir} + rm -rf ${D}${libdir}/pkgconfig + rm -rf ${D}${datadir} +} + diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.8.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.8.bb deleted file mode 100644 index ba74eb1f94..0000000000 --- a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.8.bb +++ /dev/null @@ -1,18 +0,0 @@ -# -# This provides libcrypto.so.1 which contains obsolete APIs, needed for uninative in particular -# - -require libxcrypt.inc - -PROVIDES = "" -AUTO_LIBNAME_PKGS = "" -EXCLUDE_FROM_WORLD = "1" - -API = "--enable-obsolete-api" - -do_install_append () { - rm -rf ${D}${includedir} - rm -rf ${D}${libdir}/pkgconfig - rm -rf ${D}${datadir} -} - diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc index 1787f6921e..6d6990c3d5 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM ?= "file://LICENSING;md5=3bb6614cf5880cbf1b9dbd9e3d145e2c \ inherit autotools pkgconfig SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH}" -SRCREV = "acd84997a5a8b2badd28b70a642abee11272fad2" +SRCREV = "dcf7d7509a26a2fe83f115f5ee731c59749ae17e" SRCBRANCH ?= "develop" PROVIDES = "virtual/crypt" diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.10.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.10.bb new file mode 100644 index 0000000000..79dba2f6dc --- /dev/null +++ b/meta/recipes-core/libxcrypt/libxcrypt_4.4.10.bb @@ -0,0 +1,2 @@ +require libxcrypt.inc + diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.8.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.8.bb deleted file mode 100644 index aba9b1ef0c..0000000000 --- a/meta/recipes-core/libxcrypt/libxcrypt_4.4.8.bb +++ /dev/null @@ -1 +0,0 @@ -require libxcrypt.inc -- cgit v1.2.3-54-g00ecf