Merge remote-tracking branch 'origin/scarthgap' into yocto-master

This moves the system to scarthgap.  It is known to NOT work with Styhead and master,

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/meta-xilinx-core/recipes-devtools/qemu/flashstrip_1.0.bb b/meta-xilinx-core/recipes-devtools/qemu/flashstrip_1.0.bb
index 11d9146c..e1dcc5ae 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/flashstrip_1.0.bb
+++ b/meta-xilinx-core/recipes-devtools/qemu/flashstrip_1.0.bb
@@ -4,17 +4,17 @@ DESCRIPTION = "Building and installing flash strip utility"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://../flash_stripe.c;beginline=1;endline=23;md5=abb859d98b7c4eede655e1b71824125a"
 
-B = "${UNPACKDIR}/build"
+B = "${WORKDIR}/build"
 
 SRC_URI += "file://flash_stripe.c"
 
 TARGET_CC_ARCH += "${LDFLAGS}"
 
 do_compile() {
-    ${CC} ${UNPACKDIR}/flash_stripe.c -o flash_strip
-    ${CC} ${UNPACKDIR}/flash_stripe.c -o flash_unstrip
-    ${CC} ${UNPACKDIR}/flash_stripe.c -o flash_strip_bw -DFLASH_STRIPE_BW
-    ${CC} ${UNPACKDIR}/flash_stripe.c -o flash_unstrip_bw -DUNSTRIP -DFLASH_STRIPE_BW
+    ${CC} ${WORKDIR}/flash_stripe.c -o flash_strip
+    ${CC} ${WORKDIR}/flash_stripe.c -o flash_unstrip
+    ${CC} ${WORKDIR}/flash_stripe.c -o flash_strip_bw -DFLASH_STRIPE_BW
+    ${CC} ${WORKDIR}/flash_stripe.c -o flash_unstrip_bw -DUNSTRIP -DFLASH_STRIPE_BW
 }
 
 do_install() {