From patchwork Mon Jul 21 01:09:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Davis Jr X-Patchwork-Id: 67152 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 274A5C83F22 for ; Mon, 21 Jul 2025 01:10:59 +0000 (UTC) Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) by mx.groups.io with SMTP id smtpd.web10.29981.1753060256574203563 for ; Sun, 20 Jul 2025 18:10:56 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@underview.tech header.s=google header.b=duCdBDcI; spf=pass (domain: underview.tech, ip: 209.85.219.42, mailfrom: vince@underview.tech) Received: by mail-qv1-f42.google.com with SMTP id 6a1803df08f44-6f8aa9e6ffdso40175646d6.3 for ; Sun, 20 Jul 2025 18:10:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=underview.tech; s=google; t=1753060255; x=1753665055; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RVyXIqnaRLTKZPu721o7FJUReWE4Ybj0ippXF9PwIqY=; b=duCdBDcIOt4IvcwC/QAieV7rLeuXUuLe9XU90FeDfERRrQzjmXm7H79/FJRbRapwmV F6eEPJN/Vcy3KFw99TgQYTrzwJzPIsS7bIRoJzN4zmyceeMPmWZXc0+pOX5g1pyVtLYc MVs1WPVyDmIMB0i6DDAJ1iw2TyaqW/vQg2hWQWpy8sOUOBzR7iBioL//yy8qisYhAvpD 5ClDtmYKQecvGK2sE184nBO+wAul6786Pw8CVsjw70SvbQcaYe66udEPQwGCwPjggfKc mr6VmUbO/iiaTZziI/EGOaqLvHflr23jzPZobVAHZuAkXMdZGdOk5r+Tzh4z461CSFgH KFXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753060255; x=1753665055; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RVyXIqnaRLTKZPu721o7FJUReWE4Ybj0ippXF9PwIqY=; b=XueFVtEsUEGCwq9AlTQ1nSzng410ph/cqqo3jcFqj4GEIivX7hZCRCuATaTpluUEvq opgdJ7tB8s1zlZk+D7l9sc7TnEIBq4zcXNMzvtJSQlT/7Xtt7VnW8kv18ty1Fr5LOMQQ ACJG5mnOvHY4pxjfRiRAO5X57EC18rS0YeirODNeEIzFRkCXkLp7fdma//jNHZudDnmc s9bQUWraTzN3LJwNesGnfZzC333FKjaERqkI6+Bzt3n5GQ4c/vhFkJBTKrE4zrBZmaB0 m+ejQ8nLIobsZQ6eJKpAVjAAvPkUM8diOaNWq6M6pjsoq9LfjeHR8PhqKHYPa7rj6N7H yA8A== X-Gm-Message-State: AOJu0YyQtgXytfWO7nkhYs58BcqTwmJE7xya17j3q5BPteDOIvpCxgEv wD+wgkg3EAeTmzWEIoBnWoMc85bJkKRTizhU8p4OOY73KtEFL2cKb/WPWvW9bucekmxSypkCM9X H7pf3 X-Gm-Gg: ASbGncvREQMhpWN89LVcyZVRo9MFv086maot7tYl1eOsYxg0/qRWlGP7cYeD55o5ojX Ym6urSY95GA116ntbYaSJ8cPSZYxELm73pwrblSLOomoUsToZ/MXrAkuI51J1vX+RWnLLQbXwUn 0zr/M3ixTT/cC2Wpq6tItNNvesn986g3gf7F//wL1t3VDiR+jxtt5Sl+Z5fIv/DKjOwzBOycsRB 7dXMKs51Wnbl56mVM0XUCjOwcuO4pV9sZkI0Mkgnd3OEp56Di00OJMwYq3Cw4C2xQc3Dv+TbhC4 njb6YzQYW7NGQeSiURmHdrylVY4KUDNCuuKCxvLpc+7lMuqIjznv0a3THNwAvV2FraUuHhkId8T nCztKIBmKgjhdO8ktURCE3A== X-Google-Smtp-Source: AGHT+IFAbFR+p0XH1tMtldbYCf9iw5mL57iDjMnfVDdPKU23zBBLpy1rpC7IIRbC04a3ek3sZosBHw== X-Received: by 2002:a05:6214:33c5:b0:704:a42e:167e with SMTP id 6a1803df08f44-704f4aab794mr266942256d6.28.1753060255155; Sun, 20 Jul 2025 18:10:55 -0700 (PDT) Received: from vince-server.. ([2601:406:4d01:1820::b05c]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-7051ba9270csm33855256d6.86.2025.07.20.18.10.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Jul 2025 18:10:54 -0700 (PDT) From: Vincent Davis Jr To: openembedded-core@lists.openembedded.org Cc: Vincent Davis Jr Subject: [PATCH 2/3] wks: add loader-bios to bootimg_pcbios source_params Date: Sun, 20 Jul 2025 21:09:38 -0400 Message-ID: <20250721010939.3561904-2-vince@underview.tech> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250721010939.3561904-1-vince@underview.tech> References: <20250721010939.3561904-1-vince@underview.tech> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 21 Jul 2025 01:10:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/220643 source_params['loader-bios'] is required for newer updates to bootimg_pcbios wics plugin. Signed-off-by: Vincent Davis Jr --- meta-selftest/recipes-test/images/wic-image-minimal.wks | 2 +- meta-selftest/wic/overlayfs_etc.wks.in | 2 +- meta-selftest/wic/test_biosplusefi_plugin.wks | 2 +- meta-selftest/wic/test_rawcopy_plugin.wks.in | 2 +- scripts/lib/wic/canned-wks/common.wks.inc | 2 +- scripts/lib/wic/canned-wks/directdisk-gpt.wks | 2 +- scripts/lib/wic/canned-wks/directdisk-multi-rootfs.wks | 2 +- scripts/lib/wic/help.py | 4 ++-- scripts/lib/wic/plugins/source/bootimg_biosplusefi.py | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meta-selftest/recipes-test/images/wic-image-minimal.wks b/meta-selftest/recipes-test/images/wic-image-minimal.wks index 4186b16517..b0471b59ed 100644 --- a/meta-selftest/recipes-test/images/wic-image-minimal.wks +++ b/meta-selftest/recipes-test/images/wic-image-minimal.wks @@ -2,7 +2,7 @@ # long-description: This image contains boot partition and 3 rootfs partitions # created from core-image-minimal and wic-image-minimal image recipes. -part /boot --source bootimg_pcbios --ondisk sda --label boot --active --align 1024 +part /boot --source bootimg_pcbios --sourceparams="loader-bios=syslinux" --ondisk sda --label boot --active --align 1024 part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid part /media --source rootfs --rootfs-dir=wic-image-minimal --ondisk sda --fstype=ext4 --label uuid-test --align 1024 --use-uuid --fsuuid 2c71ef06-a81d-4735-9d3a-379b69c6bdba part /mnt --source rootfs --rootfs-dir=wic-image-minimal --ondisk sda --fstype=ext4 --label core --align 1024 diff --git a/meta-selftest/wic/overlayfs_etc.wks.in b/meta-selftest/wic/overlayfs_etc.wks.in index 8375d73a9c..89f2771e49 100644 --- a/meta-selftest/wic/overlayfs_etc.wks.in +++ b/meta-selftest/wic/overlayfs_etc.wks.in @@ -1,4 +1,4 @@ -part /boot --active --source bootimg_biosplusefi --ondisk sda --sourceparams="loader=grub-efi" --align 1024 +part /boot --active --source bootimg_biosplusefi --ondisk sda --sourceparams="loader=grub-efi,loader-bios=syslinux" --align 1024 part / --source rootfs --ondisk sda --fstype=${OVERLAYFS_ROOTFS_TYPE} --use-uuid --align 1024 part --ondisk sda --fstype=ext4 --size=5 --align 1024 bootloader --ptable gpt --timeout=1 --append="rootfstype=${OVERLAYFS_ROOTFS_TYPE} console=ttyS0,115200 console=tty0 ${OVERLAYFS_INIT_OPTION}" diff --git a/meta-selftest/wic/test_biosplusefi_plugin.wks b/meta-selftest/wic/test_biosplusefi_plugin.wks index 4be6643a6f..ef31ad20c4 100644 --- a/meta-selftest/wic/test_biosplusefi_plugin.wks +++ b/meta-selftest/wic/test_biosplusefi_plugin.wks @@ -1,6 +1,6 @@ # short-description: This file is used in oe-selftest wic module to test biosplusefi plugin -part /boot --source bootimg_biosplusefi --sourceparams="loader=grub-efi" --active --align 1024 --use-uuid +part /boot --source bootimg_biosplusefi --sourceparams="loader=grub-efi,loader-bios=syslinux" --active --align 1024 --use-uuid part / --source rootfs --fstype=ext4 --align 1024 --use-uuid bootloader --timeout=0 --append="console=ttyS0,115200n8" diff --git a/meta-selftest/wic/test_rawcopy_plugin.wks.in b/meta-selftest/wic/test_rawcopy_plugin.wks.in index ba324d9980..cb25acf0c6 100644 --- a/meta-selftest/wic/test_rawcopy_plugin.wks.in +++ b/meta-selftest/wic/test_rawcopy_plugin.wks.in @@ -1,6 +1,6 @@ # 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 --sourceparams="loader-bios=syslinux" part / --source rawcopy --sourceparams="file=${IMAGE_LINK_NAME_CORE_IMAGE_MINIMAL}.ext4" --use-uuid bootloader --timeout=0 --append="console=ttyS0,115200n8" diff --git a/scripts/lib/wic/canned-wks/common.wks.inc b/scripts/lib/wic/canned-wks/common.wks.inc index 4a440ddafe..673bd15725 100644 --- a/scripts/lib/wic/canned-wks/common.wks.inc +++ b/scripts/lib/wic/canned-wks/common.wks.inc @@ -1,3 +1,3 @@ # This file is included into 3 canned wks files from this directory -part /boot --source bootimg_pcbios --ondisk sda --label boot --active --align 1024 +part /boot --source bootimg_pcbios --sourceparams="loader-bios=syslinux" --ondisk sda --label boot --active --align 1024 part / --source rootfs --use-uuid --fstype=ext4 --label platform --align 1024 diff --git a/scripts/lib/wic/canned-wks/directdisk-gpt.wks b/scripts/lib/wic/canned-wks/directdisk-gpt.wks index cb640056f1..07040d316c 100644 --- a/scripts/lib/wic/canned-wks/directdisk-gpt.wks +++ b/scripts/lib/wic/canned-wks/directdisk-gpt.wks @@ -3,7 +3,7 @@ # can directly dd to boot media. -part /boot --source bootimg_pcbios --ondisk sda --label boot --active --align 1024 +part /boot --source bootimg_pcbios --sourceparams="loader-bios=syslinux" --ondisk sda --label boot --active --align 1024 part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid bootloader --ptable gpt --timeout=0 --append="rootwait rootfstype=ext4 video=vesafb vga=0x318 console=tty0 console=ttyS0,115200n8" diff --git a/scripts/lib/wic/canned-wks/directdisk-multi-rootfs.wks b/scripts/lib/wic/canned-wks/directdisk-multi-rootfs.wks index 4fd1999ffb..fb51a22283 100644 --- a/scripts/lib/wic/canned-wks/directdisk-multi-rootfs.wks +++ b/scripts/lib/wic/canned-wks/directdisk-multi-rootfs.wks @@ -15,7 +15,7 @@ # # - or any combinations of -r and --rootfs command line options -part /boot --source bootimg_pcbios --ondisk sda --label boot --active --align 1024 +part /boot --source bootimg_pcbios --sourceparams="loader-bios=syslinux" --ondisk sda --label boot --active --align 1024 part / --source rootfs --rootfs-dir=rootfs1 --ondisk sda --fstype=ext4 --label platform --align 1024 part /rescue --source rootfs --rootfs-dir=rootfs2 --ondisk sda --fstype=ext4 --label secondary --align 1024 diff --git a/scripts/lib/wic/help.py b/scripts/lib/wic/help.py index 2e3061f343..5b170594bb 100644 --- a/scripts/lib/wic/help.py +++ b/scripts/lib/wic/help.py @@ -544,7 +544,7 @@ DESCRIPTION the --source param given to that partition. For example, if the partition is set up like this: - part /boot --source bootimg_pcbios ... + part /boot --source bootimg_pcbios --sourceparams="loader-bios=syslinux" ... then the methods defined as class members of the plugin having the matching bootimg_pcbios .name class member would be used. @@ -794,7 +794,7 @@ DESCRIPTION Here is a content of test.wks: - part /boot --source bootimg_pcbios --ondisk sda --label boot --active --align 1024 + part /boot --source bootimg_pcbios --sourceparams="loader-bios=grub" --ondisk sda --label boot --active --align 1024 part / --source rootfs --ondisk sda --fstype=ext3 --label platform --align 1024 bootloader --timeout=0 --append="rootwait rootfstype=ext3 video=vesafb vga=0x318 console=tty0" diff --git a/scripts/lib/wic/plugins/source/bootimg_biosplusefi.py b/scripts/lib/wic/plugins/source/bootimg_biosplusefi.py index 4279ddded8..2687217ad2 100644 --- a/scripts/lib/wic/plugins/source/bootimg_biosplusefi.py +++ b/scripts/lib/wic/plugins/source/bootimg_biosplusefi.py @@ -71,7 +71,7 @@ class BootimgBiosPlusEFIPlugin(SourcePlugin): plugin, as long they does not cause issue in the other plugin. Example wic configuration: - part /boot --source bootimg_biosplusefi --sourceparams="loader=grub-efi"\\ + part /boot --source bootimg_biosplusefi --sourceparams="loader=grub-efi,loader-bios=syslinux" \\ --ondisk sda --label os_boot --active --align 1024 --use-uuid """