recipes: Start WORKDIR -> UNPACKDIR transition

Replace references of WORKDIR with UNPACKDIR where it makes sense to do
so in preparation for changing the default value of UNPACKDIR.

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

3 files changed, 10 insertions, 10 deletions

diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb b/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb
index 3f9d49a2d2..430b53c4d0 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb
+++ b/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb
@@ -14,17 +14,17 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 do_install() {
     install -d ${D}${bindir}
-    install -m 0755 ${WORKDIR}/android-gadget-setup ${D}${bindir}
-    install -m 0755 ${WORKDIR}/android-gadget-start ${D}${bindir}
-    install -m 0755 ${WORKDIR}/android-gadget-cleanup ${D}${bindir}
+    install -m 0755 ${UNPACKDIR}/android-gadget-setup ${D}${bindir}
+    install -m 0755 ${UNPACKDIR}/android-gadget-start ${D}${bindir}
+    install -m 0755 ${UNPACKDIR}/android-gadget-cleanup ${D}${bindir}
 
-    if [ -r ${WORKDIR}/android-gadget-setup.machine ] ; then
+    if [ -r ${UNPACKDIR}/android-gadget-setup.machine ] ; then
         install -d ${D}${sysconfdir}
-        install -m 0644 ${WORKDIR}/android-gadget-setup.machine ${D}${sysconfdir}
+        install -m 0644 ${UNPACKDIR}/android-gadget-setup.machine ${D}${sysconfdir}
     fi
 
     install -d ${D}${systemd_unitdir}/system/android-tools-adbd.service.d
-    install -m 0644 ${WORKDIR}/10-adbd-configfs.conf ${D}${systemd_unitdir}/system/android-tools-adbd.service.d
+    install -m 0644 ${UNPACKDIR}/10-adbd-configfs.conf ${D}${systemd_unitdir}/system/android-tools-adbd.service.d
 }
 
 FILES:${PN} += " \
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb b/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb
index 34b1a9bdd2..f73be8dbbf 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb
+++ b/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb
@@ -9,7 +9,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 do_install() {
     install -d ${D}${bindir}
-    install -m 0755 ${WORKDIR}/android-gadget-setup ${D}${bindir}
+    install -m 0755 ${UNPACKDIR}/android-gadget-setup ${D}${bindir}
 }
 
 python () {
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
index 1c66ea4997..6343256d39 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
+++ b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
@@ -88,7 +88,7 @@ TOOLS:class-native = "fastboot ext4_utils mkbootimg"
 TOOLS:class-nativesdk = "fastboot ext4_utils mkbootimg"
 
 do_compile() {
-    cp ${WORKDIR}/gitignore ${S}/.gitignore
+    cp ${UNPACKDIR}/gitignore ${S}/.gitignore
 
     # Setting both variables below causing our makefiles to not work with
     # implicit make rules
@@ -123,7 +123,7 @@ do_compile() {
 
     for tool in ${TOOLS}; do
       mkdir -p ${B}/${tool}
-      oe_runmake -f ${B}/${tool}.mk -C ${B}/${tool}
+      oe_runmake -f ${UNPACKDIR}/${BPN}/${tool}.mk -C ${B}/${tool}
     done
 }
 
@@ -151,7 +151,7 @@ do_install() {
     fi
 
     # Outside the if statement to avoid errors during do_package
-    install -D -p -m0644 ${WORKDIR}/android-tools-adbd.service \
+    install -D -p -m0644 ${UNPACKDIR}/android-tools-adbd.service \
       ${D}${systemd_unitdir}/system/android-tools-adbd.service
 
     if echo ${TOOLS} | grep -q "fastboot" ; then