libxcrypt-compat,libxcrypt: upgrade 4.4.38 -> 4.5.0

Remove branch variable and add tag in SRC_URI

License-Update: New source files added under 0-BSD and BSD-3-Clause licenses

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.38.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.5.0.bb
similarity index 99%
rename from meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.38.bb
rename to meta/recipes-core/libxcrypt/libxcrypt-compat_4.5.0.bb
index bb4e2032dd69e59ed2e57cb85c46c98c3c55b6d9..30ec6a4674efc27dbbf51c8776c30806df7fa900 100644 (file)
--- a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.38.bb
+++ b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.5.0.bb
@@ -16,4 +16,3 @@ do_install:append () {
        rm -rf ${D}${libdir}/libcrypt.so
        rm -rf ${D}${datadir}
 }
-

diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc
index da515d19270e51b73b09632d3ff286bba1bd2bcd..bef40b0ae646d23ce3101132c517a24671bd736d 100644 (file)
--- a/meta/recipes-core/libxcrypt/libxcrypt.inc
+++ b/meta/recipes-core/libxcrypt/libxcrypt.inc
@@ -2,17 +2,15 @@ SUMMARY = "Extended cryptographic library (from glibc)"
 DESCRIPTION = "Forked code from glibc libary to extract only crypto part."
 HOMEPAGE = "https://github.com/besser82/libxcrypt"
 SECTION = "libs"
-LICENSE = "LGPL-2.1-only"
-LIC_FILES_CHKSUM = "file://LICENSING;md5=c0a30e2b1502c55a7f37e412cd6c6a4b \
+LICENSE = "LGPL-2.1-only & 0BSD & BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSING;md5=b65434749329c34b5d32c2df3f1b4112 \
                     file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
                     "
 
 inherit autotools pkgconfig
 
-SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH};protocol=https \
-           "
-SRCREV = "55ea777e8d567e5e86ffac917c28815ac54cc341"
-SRCBRANCH ?= "master"
+SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=master;protocol=https;tag=v${PV}"
+SRCREV = "096296cb6fbecd9ad46c93a410d76c752a5d6206"
 
 PROVIDES = "virtual/crypt"
 

diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.38.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.5.0.bb
similarity index 100%
rename from meta/recipes-core/libxcrypt/libxcrypt_4.4.38.bb
rename to meta/recipes-core/libxcrypt/libxcrypt_4.5.0.bb