[cip-dev][isar-cip-core][PATCH] efibootguard: Architecture independent installation

[cip-dev][isar-cip-core][PATCH] efibootguard: Architecture independent installation

[Q. Gylstorff]

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Add globbing to install the efibootguard binary architecture independent.

Also adapt the wic plugin to use the build output.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 recipes-bsp/efibootguard/files/debian/efibootguard.install | 2 +-
 recipes-bsp/efibootguard/files/debian/efibootguard.links   | 1 -
 scripts/lib/wic/plugins/source/efibootguard-efi.py         | 6 ++++--
 3 files changed, 5 insertions(+), 4 deletions(-)
 delete mode 100644 recipes-bsp/efibootguard/files/debian/efibootguard.links

diff --git a/recipes-bsp/efibootguard/files/debian/efibootguard.install b/recipes-bsp/efibootguard/files/debian/efibootguard.install
index 0239953..462fc1d 100644
--- a/recipes-bsp/efibootguard/files/debian/efibootguard.install
+++ b/recipes-bsp/efibootguard/files/debian/efibootguard.install
@@ -1,3 +1,3 @@
 bg_setenv usr/bin
 bg_printenv usr/bin
-efibootguardx64.efi usr/share/efibootguard
+efibootguard*.efi usr/share/efibootguard
diff --git a/recipes-bsp/efibootguard/files/debian/efibootguard.links b/recipes-bsp/efibootguard/files/debian/efibootguard.links
deleted file mode 100644
index 97bab21..0000000
--- a/recipes-bsp/efibootguard/files/debian/efibootguard.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/efibootguard/efibootguardx64.efi usr/share/efibootguard/bootx64.efi
diff --git a/scripts/lib/wic/plugins/source/efibootguard-efi.py b/scripts/lib/wic/plugins/source/efibootguard-efi.py
index 858fcbf..9e6febe 100644
--- a/scripts/lib/wic/plugins/source/efibootguard-efi.py
+++ b/scripts/lib/wic/plugins/source/efibootguard-efi.py
@@ -59,7 +59,7 @@ class EfibootguardEFIPlugin(SourcePlugin):
         }
 
         distro_arch = get_bitbake_var("DISTRO_ARCH")
-        bootloader = "/usr/share/efibootguard/boot{}.efi".format(
+        bootloader = "/usr/share/efibootguard/efibootguard{}.efi".format(
             distro_to_efi_arch[distro_arch])
         part_rootfs_dir = "%s/disk/%s.%s" % (cr_workdir,
                                              part.label,
@@ -67,7 +67,9 @@ class EfibootguardEFIPlugin(SourcePlugin):
         create_dir_cmd = "install -d %s/EFI/BOOT" % part_rootfs_dir
         exec_cmd(create_dir_cmd)
 
-        name = os.path.basename(bootloader)
+        name = "boot{}.efi".format(
+            distro_to_efi_arch[distro_arch])
+
         signed_bootloader = cls._sign_file(name,
                                            bootloader,
                                            cr_workdir,
-- 
2.35.1

Re: [cip-dev][isar-cip-core][PATCH] efibootguard: Architecture independent installation

[Jan Kiszka]

On 11.03.22 15:57, Q. Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> Add globbing to install the efibootguard binary architecture independent.
> 
> Also adapt the wic plugin to use the build output.
> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
>  recipes-bsp/efibootguard/files/debian/efibootguard.install | 2 +-
>  recipes-bsp/efibootguard/files/debian/efibootguard.links   | 1 -
>  scripts/lib/wic/plugins/source/efibootguard-efi.py         | 6 ++++--
>  3 files changed, 5 insertions(+), 4 deletions(-)
>  delete mode 100644 recipes-bsp/efibootguard/files/debian/efibootguard.links
> 
> diff --git a/recipes-bsp/efibootguard/files/debian/efibootguard.install b/recipes-bsp/efibootguard/files/debian/efibootguard.install
> index 0239953..462fc1d 100644
> --- a/recipes-bsp/efibootguard/files/debian/efibootguard.install
> +++ b/recipes-bsp/efibootguard/files/debian/efibootguard.install
> @@ -1,3 +1,3 @@
>  bg_setenv usr/bin
>  bg_printenv usr/bin
> -efibootguardx64.efi usr/share/efibootguard
> +efibootguard*.efi usr/share/efibootguard
> diff --git a/recipes-bsp/efibootguard/files/debian/efibootguard.links b/recipes-bsp/efibootguard/files/debian/efibootguard.links
> deleted file mode 100644
> index 97bab21..0000000
> --- a/recipes-bsp/efibootguard/files/debian/efibootguard.links
> +++ /dev/null
> @@ -1 +0,0 @@
> -usr/share/efibootguard/efibootguardx64.efi usr/share/efibootguard/bootx64.efi
> diff --git a/scripts/lib/wic/plugins/source/efibootguard-efi.py b/scripts/lib/wic/plugins/source/efibootguard-efi.py
> index 858fcbf..9e6febe 100644
> --- a/scripts/lib/wic/plugins/source/efibootguard-efi.py
> +++ b/scripts/lib/wic/plugins/source/efibootguard-efi.py
> @@ -59,7 +59,7 @@ class EfibootguardEFIPlugin(SourcePlugin):
>          }
>  
>          distro_arch = get_bitbake_var("DISTRO_ARCH")
> -        bootloader = "/usr/share/efibootguard/boot{}.efi".format(
> +        bootloader = "/usr/share/efibootguard/efibootguard{}.efi".format(
>              distro_to_efi_arch[distro_arch])
>          part_rootfs_dir = "%s/disk/%s.%s" % (cr_workdir,
>                                               part.label,
> @@ -67,7 +67,9 @@ class EfibootguardEFIPlugin(SourcePlugin):
>          create_dir_cmd = "install -d %s/EFI/BOOT" % part_rootfs_dir
>          exec_cmd(create_dir_cmd)
>  
> -        name = os.path.basename(bootloader)
> +        name = "boot{}.efi".format(
> +            distro_to_efi_arch[distro_arch])
> +
>          signed_bootloader = cls._sign_file(name,
>                                             bootloader,
>                                             cr_workdir,

Thanks, applied.

Jan

-- 
Siemens AG, Technology
Competence Center Embedded Linux