diff options
| author | Maciej Borzecki <maciej.borzecki@rndity.com> | 2016-12-15 14:31:08 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-16 08:37:33 +0000 |
| commit | 9afaeadb37b2b2fab935755ab570cf4b1f3195f4 (patch) | |
| tree | bedb7166615b68672f27a8fb9fa5108f8004aae3 /meta/conf/machine | |
| parent | 3e4806063fe11092b2307f113a6c0b0f04104091 (diff) | |
| download | openembedded-core-9afaeadb37b2b2fab935755ab570cf4b1f3195f4.tar.gz openembedded-core-9afaeadb37b2b2fab935755ab570cf4b1f3195f4.tar.bz2 openembedded-core-9afaeadb37b2b2fab935755ab570cf4b1f3195f4.zip | |
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.
Signed-off-by: Maciej Borzecki <maciej.borzecki@rndity.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/conf/machine')
| -rw-r--r-- | 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 8997f6ba70..1b478e92ad 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" |