From 429dfff189bc605e4a07114a27504cfc8670f928 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 28 May 2021 08:04:39 +0000 Subject: libxcrypt: Upgrade 4.4.20 -> 4.4.22 (From OE-Core rev: cb1b414a3af6d0c674f15969fbe560207c4aacde) Signed-off-by: Richard Purdie --- meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.20.bb | 18 ------------------ meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.22.bb | 18 ++++++++++++++++++ meta/recipes-core/libxcrypt/libxcrypt.inc | 2 +- meta/recipes-core/libxcrypt/libxcrypt_4.4.20.bb | 2 -- meta/recipes-core/libxcrypt/libxcrypt_4.4.22.bb | 2 ++ 5 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.20.bb create mode 100644 meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.22.bb delete mode 100644 meta/recipes-core/libxcrypt/libxcrypt_4.4.20.bb create mode 100644 meta/recipes-core/libxcrypt/libxcrypt_4.4.22.bb diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.20.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.20.bb deleted file mode 100644 index ba74eb1f94..0000000000 --- a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.20.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-compat_4.4.22.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.22.bb new file mode 100644 index 0000000000..ba74eb1f94 --- /dev/null +++ b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.22.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.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc index c16068c161..e4505a666d 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=afed27a72ae2a8075978299eebaa1f5d \ inherit autotools pkgconfig SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH}" -SRCREV = "e73ff0137de5152e69e8abb0bd260541804dfe5a" +SRCREV = "3df9620d08db207367c0c5152148665b5ce422e1" SRCBRANCH ?= "develop" SRC_URI += "file://fix_cflags_handling.patch" diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.20.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.20.bb deleted file mode 100644 index 79dba2f6dc..0000000000 --- a/meta/recipes-core/libxcrypt/libxcrypt_4.4.20.bb +++ /dev/null @@ -1,2 +0,0 @@ -require libxcrypt.inc - diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.22.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.22.bb new file mode 100644 index 0000000000..79dba2f6dc --- /dev/null +++ b/meta/recipes-core/libxcrypt/libxcrypt_4.4.22.bb @@ -0,0 +1,2 @@ +require libxcrypt.inc + -- cgit v1.2.3-54-g00ecf