[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3785/8267] selftest: wic: qemux86: use weak assignment for WKS_FILE

[Emmanuele Bassi <ebassi src gnome org>]

commit 1e8c6434c94383b234ca94a4b042bc56fa30b4b5
Author: Maciej Borzecki <maciej borzecki rndity com>
Date:   Thu Dec 15 14:31:08 2016 +0100

    selftest: wic: qemux86: use weak assignment for WKS_FILE
    
    A follow-up of a fix introduced in
    1b32c6ed025745cb06b7c28ca0fe9e416ce7abfa (selftest: wic: fix test_qemu).
    
    Wic test_qemu fails on qemux86 due to a direct assignment of WKS_FILE in machine
    configuration. Using default assignment allows WKS_FILE to be overwritten in
    test setup.
    
    (From OE-Core rev: 9afaeadb37b2b2fab935755ab570cf4b1f3195f4)
    
    Signed-off-by: Maciej Borzecki <maciej borzecki rndity com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/conf/machine/qemux86.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 8997f6b..1b478e9 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -28,5 +28,5 @@ MACHINE_FEATURES += "x86"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
 
-WKS_FILE = "directdisk.wks"
+WKS_FILE ?= "directdisk.wks"
 do_image_wic[depends] += "syslinux:do_build syslinux-native:do_populate_sysroot 
mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"