From 365e9110b9ee938259c306e66a07cac4e2ddc3c0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 22 May 2024 13:25:43 -0700 Subject: recipes: Switch WORKDIR use with UNPACKDIR This is being enforced in master oe-core Signed-off-by: Khem Raj --- recipes-extended/merge-files/merge-files_1.0.bb | 5 ++--- recipes-extended/testfloat/testfloat_2a.bb | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'recipes-extended') diff --git a/recipes-extended/merge-files/merge-files_1.0.bb b/recipes-extended/merge-files/merge-files_1.0.bb index 5b3ca7edc..bd788fdb5 100644 --- a/recipes-extended/merge-files/merge-files_1.0.bb +++ b/recipes-extended/merge-files/merge-files_1.0.bb @@ -5,14 +5,13 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 inherit allarch SRC_URI = "file://merge" -S = "${WORKDIR}" MERGED_DST ?= "${ROOT_HOME}" do_install () { install -d ${D}/${MERGED_DST} - find ${WORKDIR}/merge/ -maxdepth 1 -mindepth 1 -not -name README \ + find ${UNPACKDIR}/merge/ -maxdepth 1 -mindepth 1 -not -name README \ -exec cp -fr '{}' ${D}/${MERGED_DST}/ \; - find ${WORKDIR}/merge/ -maxdepth 1 -mindepth 1 -exec rm -fr '{}' \; + find ${UNPACKDIR}/merge/ -maxdepth 1 -mindepth 1 -exec rm -fr '{}' \; } do_configure[noexec] = "1" do_compile[noexec] = "1" diff --git a/recipes-extended/testfloat/testfloat_2a.bb b/recipes-extended/testfloat/testfloat_2a.bb index 4ed2ceb39..60e9b864b 100644 --- a/recipes-extended/testfloat/testfloat_2a.bb +++ b/recipes-extended/testfloat/testfloat_2a.bb @@ -18,7 +18,7 @@ SRC_URI[SoftFloat.sha256sum] = "89d14b55113a2ba8cbda7011443ba1d298d381c89d939515 S = "${WORKDIR}/TestFloat-2a" do_unpack2(){ - mv ${WORKDIR}/SoftFloat-2b ${S}/SoftFloat-2b + mv ${UNPACKDIR}/SoftFloat-2b ${S}/SoftFloat-2b cd ${S} if [ -n "$(which fromdos)" ];then find -type f -exec fromdos {} \; -- cgit v1.2.3-54-g00ecf