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 10:23:23 +0000 |
| commit | 1e8c6434c94383b234ca94a4b042bc56fa30b4b5 (patch) | |
| tree | 6b6aced3d8a2429649614ea9eda636b86d66e7a3 /meta/conf | |
| parent | 6bba41832b465fa8c13243a5ad5f07309c2371b4 (diff) | |
| download | poky-1e8c6434c94383b234ca94a4b042bc56fa30b4b5.tar.gz | |
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>
Diffstat (limited to 'meta/conf')
| -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" | |||
| 28 | 28 | ||
| 29 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" | 29 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" |
| 30 | 30 | ||
| 31 | WKS_FILE = "directdisk.wks" | 31 | WKS_FILE ?= "directdisk.wks" |
| 32 | do_image_wic[depends] += "syslinux:do_build syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" | 32 | do_image_wic[depends] += "syslinux:do_build syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" |