recipes: Switch WORKDIR use with UNPACKDIR

This is being enforced in master oe-core

Signed-off-by: Khem Raj <raj.khem@gmail.com>

1 files changed, 2 insertions, 3 deletions

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"