From 9afaeadb37b2b2fab935755ab570cf4b1f3195f4 Mon Sep 17 00:00:00 2001 From: Maciej Borzecki Date: Thu, 15 Dec 2016 14:31:08 +0100 Subject: 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 Signed-off-by: Ross Burton --- meta/conf/machine/qemux86.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" -- cgit 1.2.3-korg