| Message ID | 20201210163242.3329917-1-ross.burton@arm.com |
|---|---|
| State | Master Next |
| Commit | 080e698ddcb80291e0a54d60ccc4c6111e56ff5f |
| Headers | show |
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} }
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 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#145524): https://lists.openembedded.org/g/openembedded-core/message/145524 Mute This Topic: https://lists.openembedded.org/mt/78857969/3616849 Group Owner: openembedded-core+owner@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [michael@yoctoproject.org] -=-=-=-=-=-=-=-=-=-=-=-
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 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#145559): https://lists.openembedded.org/g/openembedded-core/message/145559 Mute This Topic: https://lists.openembedded.org/mt/78857969/1003190 Group Owner: openembedded-core+owner@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [mhalstead@linuxfoundation.org] -=-=-=-=-=-=-=-=-=-=-=-
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 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#145563): https://lists.openembedded.org/g/openembedded-core/message/145563 Mute This Topic: https://lists.openembedded.org/mt/78857969/3616849 Group Owner: openembedded-core+owner@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [michael@yoctoproject.org] -=-=-=-=-=-=-=-=-=-=-=-
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
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#145599): https://lists.openembedded.org/g/openembedded-core/message/145599
Mute This Topic: https://lists.openembedded.org/mt/78857969/1003190
Group Owner: openembedded-core+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [mhalstead@linuxfoundation.org]
-=-=-=-=-=-=-=-=-=-=-=-
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 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#145630): https://lists.openembedded.org/g/openembedded-core/message/145630 Mute This Topic: https://lists.openembedded.org/mt/78857969/3616849 Group Owner: openembedded-core+owner@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [michael@yoctoproject.org] -=-=-=-=-=-=-=-=-=-=-=-
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(-) -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#145451): https://lists.openembedded.org/g/openembedded-core/message/145451 Mute This Topic: https://lists.openembedded.org/mt/78857969/1003190 Group Owner: openembedded-core+owner@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [mhalstead@linuxfoundation.org] -=-=-=-=-=-=-=-=-=-=-=-