From: Ed Bartosh Date: Wed, 18 Jan 2017 17:24:27 +0000 (+0200) Subject: selftest: wic: don't set WKS_FILE X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=78d4d09cf231b90b6c6bceb5f0b2f447ec0ca36e;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git selftest: wic: don't set WKS_FILE Setting WKS_FILE variable should be done only when wic image is expected to be built by bitbake. If it's set for all images it breaks image building in some cases. (From OE-Core rev: 46b84310f7df157c2ef290a60f5c2136d4206f09) Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py index 14109c4b5a9..32b74469d85 100644 --- a/meta/lib/oeqa/selftest/wic.py +++ b/meta/lib/oeqa/selftest/wic.py @@ -44,8 +44,7 @@ class Wic(oeSelfTest): def setUpLocal(self): """This code is executed before each test method.""" self.write_config('IMAGE_FSTYPES += " hddimg"\n' - 'MACHINE_FEATURES_append = " efi"\n' - 'WKS_FILE = "wic-image-minimal"\n') + 'MACHINE_FEATURES_append = " efi"\n') # Do this here instead of in setUpClass as the base setUp does some # clean up which can result in the native tools built earlier in