From 17400624fa4f800912887ad06d29a494255498be Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 14 Jun 2023 11:28:49 +0200 Subject: libxcrypt: upgrade 4.4.33 -> 4.4.34 (From OE-Core rev: d18e89bd2b46c6e266cc39dbe9fdb6c032f5f1fe) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.33.bb | 18 ------------------ meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.34.bb | 18 ++++++++++++++++++ meta/recipes-core/libxcrypt/libxcrypt.inc | 4 ++-- meta/recipes-core/libxcrypt/libxcrypt_4.4.33.bb | 2 -- meta/recipes-core/libxcrypt/libxcrypt_4.4.34.bb | 2 ++ 5 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.33.bb create mode 100644 meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.34.bb delete mode 100644 meta/recipes-core/libxcrypt/libxcrypt_4.4.33.bb create mode 100644 meta/recipes-core/libxcrypt/libxcrypt_4.4.34.bb (limited to 'meta') diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.33.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.33.bb deleted file mode 100644 index ec9f9f4fa3..0000000000 --- a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.33.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.34.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.34.bb new file mode 100644 index 0000000000..ec9f9f4fa3 --- /dev/null +++ b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.34.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 61b0381076..4d145cf3cc 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://LICENSING;md5=c0a30e2b1502c55a7f37e412cd6c6a4b \ inherit autotools pkgconfig SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH};protocol=https" -SRCREV = "d7fe1ac04c326dba7e0440868889d1dccb41a175" -SRCBRANCH ?= "develop" +SRCREV = "e80cfde51bb4fe4bcf27585810e0b4ea3d1e4d7d" +SRCBRANCH ?= "master" SRC_URI += "file://fix_cflags_handling.patch" diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.33.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.33.bb deleted file mode 100644 index 79dba2f6dc..0000000000 --- a/meta/recipes-core/libxcrypt/libxcrypt_4.4.33.bb +++ /dev/null @@ -1,2 +0,0 @@ -require libxcrypt.inc - diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.34.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.34.bb new file mode 100644 index 0000000000..79dba2f6dc --- /dev/null +++ b/meta/recipes-core/libxcrypt/libxcrypt_4.4.34.bb @@ -0,0 +1,2 @@ +require libxcrypt.inc + -- cgit v1.2.3-54-g00ecf