meta-openembedded/all: adapt to UNPACKDIR changes

Please see
https://git.yoctoproject.org/poky/commit/?id=4dd321f8b83afecd962393101b2a6861275b5265
for what changes are needed, and sed commands that can be used to make them en masse.

I've verified that bitbake -c patch world works with these, but did not run a world
build; the majority of recipes shouldn't need further fixups, but if there are
some that still fall out, they can be fixed in followups.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

6 files changed, 2 insertions, 6 deletions

diff --git a/meta-oe/recipes-crypto/botan/botan_3.7.1.bb b/meta-oe/recipes-crypto/botan/botan_3.7.1.bb
index a9d080c9a5..74f895cf3c 100644
--- a/meta-oe/recipes-crypto/botan/botan_3.7.1.bb
+++ b/meta-oe/recipes-crypto/botan/botan_3.7.1.bb
@@ -7,7 +7,7 @@ SECTION = "libs"
 SRC_URI = "https://botan.randombit.net/releases/Botan-${PV}.tar.xz"
 SRC_URI[sha256sum] = "fc0620463461caaea8e60f06711d7e437a3ad1eebd6de4ac29c14bbd901ccd1b"
 
-S = "${WORKDIR}/Botan-${PV}"
+S = "${UNPACKDIR}/Botan-${PV}"
 
 inherit python3native siteinfo lib_package
 
diff --git a/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.6.bb b/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.6.bb
index b8ffa45947..840c04e52e 100644
--- a/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.6.bb
+++ b/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.6.bb
@@ -12,7 +12,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=bc974d217b525ea216a336adb73e1220"
 SRCREV = "2543e6e5037c0b1b448282c2793f8a6ce8b12d71"
 SRC_URI = "git://git.kernel.org/pub/scm/fs/fsverity/fsverity-utils.git;branch=master"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "openssl"
 
diff --git a/meta-oe/recipes-crypto/libkcapi/libkcapi_1.5.0.bb b/meta-oe/recipes-crypto/libkcapi/libkcapi_1.5.0.bb
index a34614dd9d..7d27081964 100644
--- a/meta-oe/recipes-crypto/libkcapi/libkcapi_1.5.0.bb
+++ b/meta-oe/recipes-crypto/libkcapi/libkcapi_1.5.0.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "https://www.chronox.de/libkcapi/index.html"
 LICENSE = "BSD-3-Clause | GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=3d8a091d797491204567185a6efce70f"
 
-S = "${WORKDIR}/git"
 SRCREV = "fc937358e71253a6efaa3ba74885364976b040ea"
 SRC_URI = "git://github.com/smuellerDD/libkcapi.git;branch=master;protocol=https \
           "
diff --git a/meta-oe/recipes-crypto/libtomcrypt/libtomcrypt_1.18.2.bb b/meta-oe/recipes-crypto/libtomcrypt/libtomcrypt_1.18.2.bb
index 5479007d92..a9a147c35b 100644
--- a/meta-oe/recipes-crypto/libtomcrypt/libtomcrypt_1.18.2.bb
+++ b/meta-oe/recipes-crypto/libtomcrypt/libtomcrypt_1.18.2.bb
@@ -21,7 +21,6 @@ SRC_URI = "git://github.com/libtom/libtomcrypt.git;protocol=https;branch=master
 
 SRCREV = "7e7eb695d581782f04b24dc444cbfde86af59853"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig
 
diff --git a/meta-oe/recipes-crypto/monocypher/monocypher_4.0.2.bb b/meta-oe/recipes-crypto/monocypher/monocypher_4.0.2.bb
index 813c6ec4c8..a601d88e7c 100644
--- a/meta-oe/recipes-crypto/monocypher/monocypher_4.0.2.bb
+++ b/meta-oe/recipes-crypto/monocypher/monocypher_4.0.2.bb
@@ -11,7 +11,7 @@ SRC_URI[sha512sum] = "bf275d4c53ff94af6cdc723a4e002e9f080f4d1436c86c76bb37870b34
 
 MIRRORS = "https://.*/.* https://github.com/LoupVaillant/Monocypher/releases/download/${PV}/${BPN}-${PV}.tar.gz "
 
-S = "${WORKDIR}/${BPN}-${PV}"
+S = "${UNPACKDIR}/${BPN}-${PV}"
 
 CFLAGS += "-pedantic -Wall -Wextra -O3"
 EXTRA_OEMAKE = "'PREFIX=${prefix}' 'DESTDIR=${D}' 'CFLAGS=${CFLAGS}' 'LIBDIR=${libdir}'"
diff --git a/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.30.0.bb b/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.30.0.bb
index d3922cf79e..15d0aefc36 100644
--- a/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.30.0.bb
+++ b/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.30.0.bb
@@ -17,7 +17,6 @@ LIC_FILES_CHKSUM = " \
 "
 SRC_URI = "git://github.com/OpenSC/${BPN}.git;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
 # master
 SRCREV = "8bed16034f629a0361fa8ff89deed2b43dc45d8b"
 PV .= "+1.30.0+git"