mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

selftest: wic: respect IMAGE_LINK_NAME also in test_rawcopy_plugin_qemu

Browse Source 
* this one is more tricky, because the test_rawcopy_plugin.wks.in file
  is used while building core-image-minimal-mtdutils, but the image filename
  inside wks.in is from core-image-minimal, so we cannot just let bitbake
  expand IMAGE_LINK_NAME, use separate variable set in the same config fragment
  IMAGE_LINK_NAME_CORE_IMAGE_MINIMAL

[YOCTO #12937]

(From OE-Core rev: 8864ee825fdc52fe7a8cf93876c81c639fba66f4)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Martin Jansa
2023-03-13 13:15:31 +01:00
committed by Richard Purdie
parent af9f67606c
commit e1334b120e
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-selftest/wic/test_rawcopy_plugin.wks.in
+1 -1
View File
@@ -1,6 +1,6 @@
# short-description: This file is used in oe-selftest wic module to test rawcopy plugin # short-description: This file is used in oe-selftest wic module to test rawcopy plugin
part /boot --active --source bootimg-pcbios part /boot --active --source bootimg-pcbios
part / --source rawcopy --sourceparams="file=core-image-minimal-${MACHINE}.ext4" --use-uuid part / --source rawcopy --sourceparams="file=${IMAGE_LINK_NAME_CORE_IMAGE_MINIMAL}.ext4" --use-uuid
bootloader --timeout=0 --append="console=ttyS0,115200n8" bootloader --timeout=0 --append="console=ttyS0,115200n8"
meta/lib/oeqa/selftest/cases/wic.py
+5 -1
View File
@@ -1034,9 +1034,13 @@ class Wic2(WicTestCase):
config = 'IMAGE_FSTYPES = "ext4"\n' config = 'IMAGE_FSTYPES = "ext4"\n'
self.append_config(config) self.append_config(config)
bitbake('core-image-minimal') bitbake('core-image-minimal')
image_link_name = get_bb_var('IMAGE_LINK_NAME', 'core-image-minimal')
self.remove_config(config) self.remove_config(config)
config = 'IMAGE_FSTYPES = "wic"\nWKS_FILE = "test_rawcopy_plugin.wks.in"\n' config = 'IMAGE_FSTYPES = "wic"\n' \
'IMAGE_LINK_NAME_CORE_IMAGE_MINIMAL = "%s"\n'\
'WKS_FILE = "test_rawcopy_plugin.wks.in"\n'\
% image_link_name
self.append_config(config) self.append_config(config)
bitbake('core-image-minimal-mtdutils') bitbake('core-image-minimal-mtdutils')
self.remove_config(config) self.remove_config(config)