[PATCH] systemd-boot: allow building for Arm targets

[PATCH] systemd-boot: allow building for Arm targets

[Ross Burton]

systemd-boot work on 32-bit and 64-bit Arm targets (assuming the firmware
does EFI, obviously), so allow it to be built.

Remove the SYSTEMD_BOOT_EFI_ARCH assignments, as they're never used.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-core/systemd/systemd-boot_246.6.bb | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/meta/recipes-core/systemd/systemd-boot_246.6.bb b/meta/recipes-core/systemd/systemd-boot_246.6.bb
index f92c639810..453351d1b1 100644
--- a/meta/recipes-core/systemd/systemd-boot_246.6.bb
+++ b/meta/recipes-core/systemd/systemd-boot_246.6.bb
@@ -47,15 +47,10 @@ RDEPENDS_${PN} += "virtual/systemd-bootconf"
 
 # Imported from the old gummiboot recipe
 TUNE_CCARGS_remove = "-mfpmath=sse"
-COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux"
+COMPATIBLE_HOST = "(aarch64.*|arm.*|x86_64.*|i.86.*)-linux"
 COMPATIBLE_HOST_x86-x32 = "null"
 
 do_compile() {
-	SYSTEMD_BOOT_EFI_ARCH="ia32"
-	if [ "${TARGET_ARCH}" = "x86_64" ]; then
-		SYSTEMD_BOOT_EFI_ARCH="x64"
-	fi
-
 	ninja src/boot/efi/${SYSTEMD_BOOT_IMAGE_PREFIX}${SYSTEMD_BOOT_IMAGE}
 }
 
-- 
2.25.1

Re: [OE-core] [PATCH] systemd-boot: allow building for Arm targets

[Anuj Mittal]

On Thu, 2020-12-10 at 16:32 +0000, Ross Burton wrote:
> 
> Remove the SYSTEMD_BOOT_EFI_ARCH assignments, as they're never used.

It's used by meta-intel. If it's not fixing any problems, can we keep
it here?

Thanks,

Anuj

Re: [OE-core] [PATCH] systemd-boot: allow building for Arm targets

[Ross Burton]

On Mon, 14 Dec 2020 at 04:26, Mittal, Anuj <anuj.mittal@intel.com> wrote:
>
> On Thu, 2020-12-10 at 16:32 +0000, Ross Burton wrote:
> >
> > Remove the SYSTEMD_BOOT_EFI_ARCH assignments, as they're never used.
>
> It's used by meta-intel. If it's not fixing any problems, can we keep
> it here?

Ah, didn't expect to find a do_install_append using it.

Can we just move the contents of that append into core?

Ross

Re: [OE-core] [PATCH] systemd-boot: allow building for Arm targets

[Ross Burton]

On Mon, 14 Dec 2020 at 14:11, Ross Burton <ross@burtonini.com> wrote:
> Can we just move the contents of that append into core?

FWIW, got a patch doing just that locally.

Ross

Re: [OE-core] [PATCH] systemd-boot: allow building for Arm targets

[Anuj Mittal]

On Mon, 2020-12-14 at 15:20 +0000, Ross Burton wrote:
> On Mon, 14 Dec 2020 at 14:11, Ross Burton <ross@burtonini.com> wrote:
> > Can we just move the contents of that append into core?
> 
> FWIW, got a patch doing just that locally.
> 

Thanks a lot, Ross.

Thanks,

Anuj

Re: [OE-core] [PATCH] systemd-boot: allow building for Arm targets

[Richard Purdie]

On Thu, 2020-12-10 at 16:32 +0000, Ross Burton wrote:
> systemd-boot work on 32-bit and 64-bit Arm targets (assuming the
> firmware
> does EFI, obviously), so allow it to be built.
> 
> Remove the SYSTEMD_BOOT_EFI_ARCH assignments, as they're never used.
> 
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---
>  meta/recipes-core/systemd/systemd-boot_246.6.bb | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/meta/recipes-core/systemd/systemd-boot_246.6.bb
> b/meta/recipes-core/systemd/systemd-boot_246.6.bb
> index f92c639810..453351d1b1 100644
> --- a/meta/recipes-core/systemd/systemd-boot_246.6.bb
> +++ b/meta/recipes-core/systemd/systemd-boot_246.6.bb
> @@ -47,15 +47,10 @@ RDEPENDS_${PN} += "virtual/systemd-bootconf"
>  
>  # Imported from the old gummiboot recipe
>  TUNE_CCARGS_remove = "-mfpmath=sse"
> -COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux"
> +COMPATIBLE_HOST = "(aarch64.*|arm.*|x86_64.*|i.86.*)-linux"
>  COMPATIBLE_HOST_x86-x32 = "null"
>  
>  do_compile() {
> -	SYSTEMD_BOOT_EFI_ARCH="ia32"
> -	if [ "${TARGET_ARCH}" = "x86_64" ]; then
> -		SYSTEMD_BOOT_EFI_ARCH="x64"
> -	fi
> -
>  	ninja
> src/boot/efi/${SYSTEMD_BOOT_IMAGE_PREFIX}${SYSTEMD_BOOT_IMAGE}
>  }

Breaks meta-intel ?:

https://autobuilder.yoctoproject.org/typhoon/#/builders/100/builds/1012/steps/12/logs/stdio

Cheers,

Richard