Update recipes for transition to UNPACKDIR

Update recipes to handle the transition to using UNPACKDIR as the
destination for unpacked files.  For recipes that had been using
S = WORKDIR, the approach used in meta-openembedded has been
followed, i.e. using UNPACKDIR in tasks for consistency.

Bug-AGL: SPEC-5147

Change-Id: I42b2b474be163c66e11a449de6eec7d748e00fbb
Signed-off-by: Scott Murray <scott.murray@konsulko.com>

5 files changed, 23 insertions, 11 deletions

diff --git a/meta-agl-kvm-demo/recipes-config/qemu-config/qemu-config-agl-cluster-demo-flutter-guest.bb b/meta-agl-kvm-demo/recipes-config/qemu-config/qemu-config-agl-cluster-demo-flutter-guest.bb
index 96d95113f..a42ca1777 100644
--- a/meta-agl-kvm-demo/recipes-config/qemu-config/qemu-config-agl-cluster-demo-flutter-guest.bb
+++ b/meta-agl-kvm-demo/recipes-config/qemu-config/qemu-config-agl-cluster-demo-flutter-guest.bb
@@ -6,6 +6,9 @@ inherit systemd allarch
 
 SRC_URI = "file://${QEMU_IMAGE}.conf"
 
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
+
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
 
@@ -21,7 +24,7 @@ do_install() {
 
     # Install conf file
     install -d ${D}${sysconfdir}/agl-qemu-runner
-    install -m 0644 ${WORKDIR}/${QEMU_IMAGE}.conf ${D}${sysconfdir}/agl-qemu-runner/
+    install -m 0644 ${UNPACKDIR}/${QEMU_IMAGE}.conf ${D}${sysconfdir}/agl-qemu-runner/
 }
 
 FILES:${PN} += "${systemd_system_unitdir}"
diff --git a/meta-agl-kvm-demo/recipes-config/qemu-config/qemu-config-agl-ivi-demo-flutter-guest.bb b/meta-agl-kvm-demo/recipes-config/qemu-config/qemu-config-agl-ivi-demo-flutter-guest.bb
index cfab8b1a7..1f8689012 100644
--- a/meta-agl-kvm-demo/recipes-config/qemu-config/qemu-config-agl-ivi-demo-flutter-guest.bb
+++ b/meta-agl-kvm-demo/recipes-config/qemu-config/qemu-config-agl-ivi-demo-flutter-guest.bb
@@ -6,6 +6,9 @@ inherit systemd allarch
 
 SRC_URI = "file://${QEMU_IMAGE}.conf"
 
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
+
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
 
@@ -21,7 +24,7 @@ do_install() {
 
     # Install conf file
     install -d ${D}${sysconfdir}/agl-qemu-runner
-    install -m 0644 ${WORKDIR}/${QEMU_IMAGE}.conf ${D}${sysconfdir}/agl-qemu-runner/
+    install -m 0644 ${UNPACKDIR}/${QEMU_IMAGE}.conf ${D}${sysconfdir}/agl-qemu-runner/
 }
 
 FILES:${PN} += "${systemd_system_unitdir}"
diff --git a/meta-agl-kvm-demo/recipes-config/qemu-config/qemu-config-vmnet0.bb b/meta-agl-kvm-demo/recipes-config/qemu-config/qemu-config-vmnet0.bb
index a5a12982e..43712416a 100644
--- a/meta-agl-kvm-demo/recipes-config/qemu-config/qemu-config-vmnet0.bb
+++ b/meta-agl-kvm-demo/recipes-config/qemu-config/qemu-config-vmnet0.bb
@@ -11,26 +11,29 @@ SRC_URI = "file://vmnet0.netdev \
 	   file://connman-nodnsproxy.conf \
 "
 
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
+
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
 
 do_install() {
     # Install systemd-networkd vmnet0 configuration
     install -d ${D}${systemd_unitdir}/network
-    install -m 0644 ${WORKDIR}/vmnet0.netdev ${D}${systemd_unitdir}/network/
-    install -m 0644 ${WORKDIR}/vmnet0.network ${D}${systemd_unitdir}/network/
+    install -m 0644 ${UNPACKDIR}/vmnet0.netdev ${D}${systemd_unitdir}/network/
+    install -m 0644 ${UNPACKDIR}/vmnet0.network ${D}${systemd_unitdir}/network/
 
     # Install QEMU bridge configuration
     install -d ${D}${sysconfdir}/qemu
-    install -m 0644 ${WORKDIR}/bridge.conf ${D}${sysconfdir}/qemu/
+    install -m 0644 ${UNPACKDIR}/bridge.conf ${D}${sysconfdir}/qemu/
 
     # Configure dnsmasq to serve DHCP to the guests
     install -d ${D}${sysconfdir}/dnsmasq.d
-    install -m 0644 ${WORKDIR}/dnsmasq-qemu.conf ${D}${sysconfdir}/dnsmasq.d/
+    install -m 0644 ${UNPACKDIR}/dnsmasq-qemu.conf ${D}${sysconfdir}/dnsmasq.d/
 
     # Disable ConnMan's local DNS proxy to not conflict with dnsmasq
     install -d ${D}${systemd_system_unitdir}/connman.service.d/
-    install -m 0644 ${WORKDIR}/connman-nodnsproxy.conf ${D}${systemd_system_unitdir}/connman.service.d/    
+    install -m 0644 ${UNPACKDIR}/connman-nodnsproxy.conf ${D}${systemd_system_unitdir}/connman.service.d/    
 }
 
 FILES:${PN} += "${systemd_unitdir}/network ${systemd_system_unitdir}"
diff --git a/meta-agl-kvm-demo/recipes-extended/agl-qemu-runner/agl-qemu-runner.bb b/meta-agl-kvm-demo/recipes-extended/agl-qemu-runner/agl-qemu-runner.bb
index b3e3a67dd..444a4923e 100644
--- a/meta-agl-kvm-demo/recipes-extended/agl-qemu-runner/agl-qemu-runner.bb
+++ b/meta-agl-kvm-demo/recipes-extended/agl-qemu-runner/agl-qemu-runner.bb
@@ -8,16 +8,19 @@ SRC_URI = "file://agl-qemu-runner.sh \
            file://agl-qemu-runner@.service \
 "
 
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
+
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
 
 do_install() {
     # Install template unit
     install -d ${D}${systemd_system_unitdir}
-    install -m 0644 ${WORKDIR}/agl-qemu-runner@.service ${D}${systemd_system_unitdir}/
+    install -m 0644 ${UNPACKDIR}/agl-qemu-runner@.service ${D}${systemd_system_unitdir}/
 
     # Install script
-    install -D -m 0755 ${WORKDIR}/agl-qemu-runner.sh ${D}${sbindir}/agl-qemu-runner.sh
+    install -D -m 0755 ${UNPACKDIR}/agl-qemu-runner.sh ${D}${sbindir}/agl-qemu-runner.sh
 }
 
 FILES:${PN} += "${systemd_system_unitdir}"
diff --git a/meta-agl-kvm-demo/recipes-graphics/wayland/weston-ini-conf_agldemo.inc b/meta-agl-kvm-demo/recipes-graphics/wayland/weston-ini-conf_agldemo.inc
index 28f871a8d..63f7be063 100644
--- a/meta-agl-kvm-demo/recipes-graphics/wayland/weston-ini-conf_agldemo.inc
+++ b/meta-agl-kvm-demo/recipes-graphics/wayland/weston-ini-conf_agldemo.inc
@@ -12,7 +12,7 @@ do_configure:append() {
     # KVM guest cluster version
     sed -e "s#host=.*#host=${REMOTING_KVM_OUTPUT_HOST}#" \
         -e "s#port=.*#port=${REMOTING_OUTPUT_PORT}#" \
-        ${WORKDIR}/remote-output.cfg.in  > ${WORKDIR}/remote-output-kvm.cfg
+        ${UNPACKDIR}/remote-output.cfg.in  > ${WORKDIR}/remote-output-kvm.cfg
 }
 
 do_compile:append() {
@@ -29,7 +29,7 @@ do_compile:append() {
     rm -f ${WORKDIR}/weston.ini.kvm
     sed -e "s/@GUEST_VM1_ID@/${GUEST_VM1_ID}/g" \
         -e "s/@GUEST_VM2_ID@/${GUEST_VM2_ID}/g" \
-        ${WORKDIR}/weston.ini.kvm.in > ${WORKDIR}/weston.ini.kvm
+        ${UNPACKDIR}/weston.ini.kvm.in > ${WORKDIR}/weston.ini.kvm
 }
 
 do_install:append() {