diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 14:27:33 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | 65133015b1cf545a0c86177ce471a0b2b9340d5c (patch) | |
tree | 2d24b99d759e7b7e611217dcc686ae0fe85a671e /meta/lib/oeqa/selftest/cases/wic.py | |
parent | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (diff) | |
download | poky-65133015b1cf545a0c86177ce471a0b2b9340d5c.tar.gz |
meta: Manual override fixes
The automated conversion of OE-Core to use the new override sytax isn't
perfect. This patches some mis-converted lines and some lines which were missed
by the automation.
(From OE-Core rev: 4e9a06b64b43131b731fb59a0305f78a98e27fbd)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/selftest/cases/wic.py')
-rw-r--r-- | meta/lib/oeqa/selftest/cases/wic.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py index 32044e74d0..2efbe514c1 100644 --- a/meta/lib/oeqa/selftest/cases/wic.py +++ b/meta/lib/oeqa/selftest/cases/wic.py | |||
@@ -1035,7 +1035,7 @@ class Wic2(WicTestCase): | |||
1035 | @only_for_arch(['i586', 'i686', 'x86_64']) | 1035 | @only_for_arch(['i586', 'i686', 'x86_64']) |
1036 | def test_biosplusefi_plugin_qemu(self): | 1036 | def test_biosplusefi_plugin_qemu(self): |
1037 | """Test biosplusefi plugin in qemu""" | 1037 | """Test biosplusefi plugin in qemu""" |
1038 | config = 'IMAGE_FSTYPES = "wic"\nWKS_FILE = "test_biosplusefi_plugin.wks"\nMACHINE_FEATURES_append = " efi"\n' | 1038 | config = 'IMAGE_FSTYPES = "wic"\nWKS_FILE = "test_biosplusefi_plugin.wks"\nMACHINE_FEATURES:append = " efi"\n' |
1039 | self.append_config(config) | 1039 | self.append_config(config) |
1040 | self.assertEqual(0, bitbake('core-image-minimal').status) | 1040 | self.assertEqual(0, bitbake('core-image-minimal').status) |
1041 | self.remove_config(config) | 1041 | self.remove_config(config) |
@@ -1072,7 +1072,7 @@ class Wic2(WicTestCase): | |||
1072 | # If an image hasn't been built yet, directory ${STAGING_DATADIR}/syslinux won't exists and _get_bootimg_dir() | 1072 | # If an image hasn't been built yet, directory ${STAGING_DATADIR}/syslinux won't exists and _get_bootimg_dir() |
1073 | # will raise with "Couldn't find correct bootimg_dir" | 1073 | # will raise with "Couldn't find correct bootimg_dir" |
1074 | # The easiest way to work-around this issue is to make sure we already built an image here, hence the bitbake call | 1074 | # The easiest way to work-around this issue is to make sure we already built an image here, hence the bitbake call |
1075 | config = 'IMAGE_FSTYPES = "wic"\nWKS_FILE = "test_biosplusefi_plugin.wks"\nMACHINE_FEATURES_append = " efi"\n' | 1075 | config = 'IMAGE_FSTYPES = "wic"\nWKS_FILE = "test_biosplusefi_plugin.wks"\nMACHINE_FEATURES:append = " efi"\n' |
1076 | self.append_config(config) | 1076 | self.append_config(config) |
1077 | self.assertEqual(0, bitbake('core-image-minimal').status) | 1077 | self.assertEqual(0, bitbake('core-image-minimal').status) |
1078 | self.remove_config(config) | 1078 | self.remove_config(config) |