systemd-boot supports automatic detection of Unified Kernel Images[1] if
the are installed into $BOOT/EFI/Linux/ with a .efi extension. In that
case a boot entry isn't needed nor is the normal kernel as the Unified
Kernel Image would likely be installed with IMAGE_EFI_BOOT_FILES.

[1] 
https://systemd.io/BOOT_LOADER_SPECIFICATION/#type-2-efi-unified-kernel-images

Signed-off-by: Kristian Klausen <krist...@klausen.dk>
---
 scripts/lib/wic/plugins/source/bootimg-efi.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py 
b/scripts/lib/wic/plugins/source/bootimg-efi.py
index cdc72543c2..f8aace823d 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -38,6 +38,9 @@ class BootimgEFIPlugin(SourcePlugin):
         """
         Create loader-specific (grub-efi) config
         """
+        if source_params.get('bootloader-only') == "true":
+            return
+
         configfile = creator.ks.bootloader.configfile
         custom_cfg = None
         if configfile:
@@ -110,6 +113,9 @@ class BootimgEFIPlugin(SourcePlugin):
         """
         Create loader-specific systemd-boot/gummiboot config
         """
+        if source_params.get('bootloader-only') == "true":
+            return
+
         install_cmd = "install -d %s/loader" % hdddir
         exec_cmd(install_cmd)
 
@@ -288,9 +294,10 @@ class BootimgEFIPlugin(SourcePlugin):
                 kernel = "%s-%s.bin" % \
                     (get_bitbake_var("KERNEL_IMAGETYPE"), 
get_bitbake_var("INITRAMFS_LINK_NAME"))
 
-        install_cmd = "install -m 0644 %s/%s %s/%s" % \
-            (staging_kernel_dir, kernel, hdddir, kernel)
-        exec_cmd(install_cmd)
+        if not source_params.get('bootloader-only') == "true":
+            install_cmd = "install -m 0644 %s/%s %s/%s" % \
+                (staging_kernel_dir, kernel, hdddir, kernel)
+            exec_cmd(install_cmd)
 
         if get_bitbake_var("IMAGE_EFI_BOOT_FILES"):
             for src_path, dst_path in cls.install_task:
-- 
2.25.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155789): 
https://lists.openembedded.org/g/openembedded-core/message/155789
Mute This Topic: https://lists.openembedded.org/mt/85455850/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

  • [OE-core] [PATCH] wic/bootimg-... Kristian Klausen via lists.openembedded.org

Reply via email to