3 files changed, 10 insertions, 10 deletions

diff --git a/meta-selftest/recipes-test/fortran/fortran-helloworld.bb b/meta-selftest/recipes-test/fortran/fortran-helloworld.bb
index 3a46404477..a897966608 100644
--- a/meta-selftest/recipes-test/fortran/fortran-helloworld.bb
+++ b/meta-selftest/recipes-test/fortran/fortran-helloworld.bb
@@ -11,7 +11,7 @@ SECURITY_CFLAGS = ""
 SECURITY_LDFLAGS = ""
 
 do_compile() {
-        ${FC} ${LDFLAGS} ${WORKDIR}/hello.f95 -o ${B}/fortran-hello
+        ${FC} ${LDFLAGS} ${UNPACKDIR}/hello.f95 -o ${B}/fortran-hello
 }
 
 do_install() {
diff --git a/meta-selftest/recipes-test/recipetool/selftest-recipetool-appendfile.bb b/meta-selftest/recipes-test/recipetool/selftest-recipetool-appendfile.bb
index e127b48b15..7698413d4d 100644
--- a/meta-selftest/recipes-test/recipetool/selftest-recipetool-appendfile.bb
+++ b/meta-selftest/recipes-test/recipetool/selftest-recipetool-appendfile.bb
@@ -17,20 +17,20 @@ SRC_URI = "file://installscript.sh \
 EXCLUDE_FROM_WORLD = "1"
 
 install_extrafunc() {
-        install -m 0644 ${WORKDIR}/selftest-replaceme-inst-func ${D}${datadir}/selftest-replaceme-inst-func
+        install -m 0644 ${UNPACKDIR}/selftest-replaceme-inst-func ${D}${datadir}/selftest-replaceme-inst-func
 }
 
 do_install() {
         install -d ${D}${datadir}/
-        install -m 0644 ${WORKDIR}/selftest-replaceme-orig ${D}${datadir}/selftest-replaceme-orig
-        install -m 0644 ${WORKDIR}/selftest-replaceme-todir ${D}${datadir}
-        install -m 0644 ${WORKDIR}/file1 ${D}${datadir}/selftest-replaceme-renamed
-        install -m 0644 ${WORKDIR}/subdir/fileinsubdir ${D}${datadir}/selftest-replaceme-subdir
-        cp ${WORKDIR}/selftest-replaceme-inst-glob* ${D}${datadir}/selftest-replaceme-inst-globfile
-        cp ${WORKDIR}/selftest-replaceme-inst-todir-glob* ${D}${datadir}
+        install -m 0644 ${UNPACKDIR}/selftest-replaceme-orig ${D}${datadir}/selftest-replaceme-orig
+        install -m 0644 ${UNPACKDIR}/selftest-replaceme-todir ${D}${datadir}
+        install -m 0644 ${UNPACKDIR}/file1 ${D}${datadir}/selftest-replaceme-renamed
+        install -m 0644 ${UNPACKDIR}/subdir/fileinsubdir ${D}${datadir}/selftest-replaceme-subdir
+        cp ${UNPACKDIR}/selftest-replaceme-inst-glob* ${D}${datadir}/selftest-replaceme-inst-globfile
+        cp ${UNPACKDIR}/selftest-replaceme-inst-todir-glob* ${D}${datadir}
         install -d ${D}${sysconfdir}
         install -m 0644 ${S}/file2 ${D}${sysconfdir}/selftest-replaceme-patched
-        sh ${WORKDIR}/installscript.sh ${D}${datadir}
+        sh ${UNPACKDIR}/installscript.sh ${D}${datadir}
         install_extrafunc
 }
 
diff --git a/meta-selftest/recipes-test/wrapper/cmdline-shebang-wrapper-test.bb b/meta-selftest/recipes-test/wrapper/cmdline-shebang-wrapper-test.bb
index c3d3548d4a..c91d00c8d9 100644
--- a/meta-selftest/recipes-test/wrapper/cmdline-shebang-wrapper-test.bb
+++ b/meta-selftest/recipes-test/wrapper/cmdline-shebang-wrapper-test.bb
@@ -9,7 +9,7 @@ EXCLUDE_FROM_WORLD = "1"
 do_install() {
     install -d ${D}${bindir}
     # was not able to make ownership preservation check
-    install -m 0400 ${WORKDIR}/test.awk ${D}${bindir}/test
+    install -m 0400 ${UNPACKDIR}/test.awk ${D}${bindir}/test
 
     perm_old="$(stat --format='%a' ${D}${bindir}/test)"
     sed -i -e 's|@AWK_BIN@|${bindir}/awk|g' ${D}${bindir}/test