From a65fd2b9d58a9b7dc4c17a557eee555356334c2c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 26 May 2025 12:56:59 +0100 Subject: wic: Update after plugin name changes Update the plugin names to account for the "-" to "_" plugin name change. (From OE-Core rev: afa1b5c9f6ed17c021e37a54d0d6abee50a60bf9) Signed-off-by: Richard Purdie --- meta/lib/oe/bootfiles.py | 2 +- meta/lib/oeqa/selftest/cases/wic.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'meta') diff --git a/meta/lib/oe/bootfiles.py b/meta/lib/oe/bootfiles.py index 155fe742db..7ee148c4e2 100644 --- a/meta/lib/oe/bootfiles.py +++ b/meta/lib/oe/bootfiles.py @@ -10,7 +10,7 @@ # Returns a list of tuples with (original filepath relative to # deploy_dir, desired filepath renaming) # -# Heavily inspired of bootimg-partition.py +# Heavily inspired of bootimg_partition.py # def get_boot_files(deploy_dir, boot_files): import re diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py index 1a67b6df51..f45608172f 100644 --- a/meta/lib/oeqa/selftest/cases/wic.py +++ b/meta/lib/oeqa/selftest/cases/wic.py @@ -153,7 +153,7 @@ class Wic(WicTestCase): # create a temporary file for the WKS content with NamedTemporaryFile("w", suffix=".wks") as wks: wks.write( - 'part --source bootimg-efi ' + 'part --source bootimg_efi ' '--sourceparams="loader=grub-efi,install-kernel-into-boot-dir=false" ' '--label boot --active\n' ) @@ -186,7 +186,7 @@ class Wic(WicTestCase): # create a temporary file for the WKS content with NamedTemporaryFile("w", suffix=".wks") as wks: wks.write( - 'part --source bootimg-efi ' + 'part --source bootimg_efi ' '--sourceparams="loader=grub-efi,install-kernel-into-boot-dir=true" ' '--label boot --active\n' ) @@ -1358,7 +1358,7 @@ class Wic2(WicTestCase): def test_biosplusefi_plugin(self): """Test biosplusefi plugin""" # Wic generation below may fail depending on the order of the unittests - # This is because bootimg-pcbios (that bootimg-biosplusefi uses) generate its MBR inside STAGING_DATADIR directory + # This is because bootimg_pcbios (that bootimg_biosplusefi uses) generate its MBR inside STAGING_DATADIR directory # which may or may not exists depending on what was built already # If an image hasn't been built yet, directory ${STAGING_DATADIR}/syslinux won't exists and _get_bootimg_dir() # will raise with "Couldn't find correct bootimg_dir" @@ -1370,7 +1370,7 @@ class Wic2(WicTestCase): img = 'core-image-minimal' with NamedTemporaryFile("w", suffix=".wks") as wks: - wks.writelines(['part /boot --active --source bootimg-biosplusefi --sourceparams="loader=grub-efi"\n', + wks.writelines(['part /boot --active --source bootimg_biosplusefi --sourceparams="loader=grub-efi"\n', 'part / --source rootfs --fstype=ext4 --align 1024 --use-uuid\n'\ 'bootloader --timeout=0 --append="console=ttyS0,115200n8"\n']) wks.flush() @@ -1390,7 +1390,7 @@ class Wic2(WicTestCase): img = 'core-image-minimal' with NamedTemporaryFile("w", suffix=".wks") as wks: - wks.writelines(['part /boot --source bootimg-efi --sourceparams="loader=uefi-kernel"\n' + wks.writelines(['part /boot --source bootimg_efi --sourceparams="loader=uefi-kernel"\n' 'part / --source rootfs --fstype=ext4 --align 1024 --use-uuid\n'\ 'bootloader --timeout=0 --append="console=ttyS0,115200n8"\n']) wks.flush() -- cgit v1.2.3-54-g00ecf