From f0c50a5bebe593dd3b5ffbe4c84688ae7e84e4fe Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 21 Feb 2020 14:45:34 -0800 Subject: libxcrypt: Upgrade to 4.4.14 release Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.12.bb | 18 ------------------ meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.14.bb | 18 ++++++++++++++++++ meta/recipes-core/libxcrypt/libxcrypt.inc | 2 +- meta/recipes-core/libxcrypt/libxcrypt_4.4.12.bb | 2 -- meta/recipes-core/libxcrypt/libxcrypt_4.4.14.bb | 2 ++ 5 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.12.bb create mode 100644 meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.14.bb delete mode 100644 meta/recipes-core/libxcrypt/libxcrypt_4.4.12.bb create mode 100644 meta/recipes-core/libxcrypt/libxcrypt_4.4.14.bb diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.12.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.12.bb deleted file mode 100644 index ba74eb1f94..0000000000 --- a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.12.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.14.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.14.bb new file mode 100644 index 0000000000..ba74eb1f94 --- /dev/null +++ b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.14.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 59744c0cf8..416205cd5c 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 = "21f93470aad8634fcf39f72db0b62642c7073a0c" +SRCREV = "5c43f7d56a31667bcdaa334bbb4edafb75672872" SRCBRANCH ?= "develop" PROVIDES = "virtual/crypt" diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.12.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.12.bb deleted file mode 100644 index 79dba2f6dc..0000000000 --- a/meta/recipes-core/libxcrypt/libxcrypt_4.4.12.bb +++ /dev/null @@ -1,2 +0,0 @@ -require libxcrypt.inc - diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.14.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.14.bb new file mode 100644 index 0000000000..79dba2f6dc --- /dev/null +++ b/meta/recipes-core/libxcrypt/libxcrypt_4.4.14.bb @@ -0,0 +1,2 @@ +require libxcrypt.inc + -- cgit 1.2.3-korg