From patchwork Fri Nov 29 17:38:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 53382 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 1FE73D729EC for ; Fri, 29 Nov 2024 17:38:16 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.119631.1732901891688952882 for ; Fri, 29 Nov 2024 09:38:11 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 733E711FB for ; Fri, 29 Nov 2024 09:38:40 -0800 (PST) Received: from cesw-amp-gbt-1s-m12830-04.oss.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 9A77A3F66E for ; Fri, 29 Nov 2024 09:38:10 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/4] gnu-efi: pass HOSTCC and INCLUDEDIR Date: Fri, 29 Nov 2024 17:38:00 +0000 Message-Id: <20241129173803.3499627-1-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 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 ; Fri, 29 Nov 2024 17:38:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/208026 Pass the correct host compiler (HOSTCC) and include directory to the build. Also enable verbose builds (V=1). Signed-off-by: Ross Burton --- meta/recipes-bsp/gnu-efi/gnu-efi_3.0.18.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.18.bb b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.18.bb index 8257190568f..092e7ed863f 100644 --- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.18.bb +++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.18.bb @@ -39,8 +39,11 @@ do_compile:prepend() { unset LDFLAGS } -EXTRA_OEMAKE = "'ARCH=${@gnu_efi_arch(d)}' 'CC=${CC}' 'AS=${AS}' 'LD=${LD}' 'AR=${AR}' \ - 'RANLIB=${RANLIB}' 'OBJCOPY=${OBJCOPY}' 'PREFIX=${prefix}' 'LIBDIR=${libdir}' \ +EXTRA_OEMAKE = "'V=1' 'ARCH=${@gnu_efi_arch(d)}' \ + 'HOSTCC=${BUILD_CC}' 'CC=${CC}' \ + 'AS=${AS}' 'LD=${LD}' 'AR=${AR}' \ + 'RANLIB=${RANLIB}' 'OBJCOPY=${OBJCOPY}' \ + 'PREFIX=${prefix}' 'LIBDIR=${libdir}' 'INCLUDEDIR=${includedir}' \ " # gnu-efi's Makefile treats prefix as toolchain prefix, so don't From patchwork Fri Nov 29 17:38:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 53381 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 1DCE9D729EF for ; Fri, 29 Nov 2024 17:38:16 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.119632.1732901892109309361 for ; Fri, 29 Nov 2024 09:38:12 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 191AC12FC for ; Fri, 29 Nov 2024 09:38:41 -0800 (PST) Received: from cesw-amp-gbt-1s-m12830-04.oss.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 4A6323F66E for ; Fri, 29 Nov 2024 09:38:11 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/4] gnu-efi: remove obsolete patch Date: Fri, 29 Nov 2024 17:38:01 +0000 Message-Id: <20241129173803.3499627-2-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241129173803.3499627-1-ross.burton@arm.com> References: <20241129173803.3499627-1-ross.burton@arm.com> 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 ; Fri, 29 Nov 2024 17:38:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/208027 The original patch in 2013[1] did this: +-libefi.a: libefi.a($(OBJS)) ++libefi.a: $(OBJS) The Makefile no longer uses this syntax and simply replacing $^ with $(OBJS) is a no-op, so this patch isn't needed. [1] meta-intel c2c13d4dba2d9c70862891adf0b250ce2be65f68 Signed-off-by: Ross Burton --- ...x-parallel-make-failure-for-archives.patch | 41 ------------------- meta/recipes-bsp/gnu-efi/gnu-efi_3.0.18.bb | 1 - 2 files changed, 42 deletions(-) delete mode 100644 meta/recipes-bsp/gnu-efi/gnu-efi/0001-Fix-parallel-make-failure-for-archives.patch diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/0001-Fix-parallel-make-failure-for-archives.patch b/meta/recipes-bsp/gnu-efi/gnu-efi/0001-Fix-parallel-make-failure-for-archives.patch deleted file mode 100644 index 3c11baca0c5..00000000000 --- a/meta/recipes-bsp/gnu-efi/gnu-efi/0001-Fix-parallel-make-failure-for-archives.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 70e30774debb9ab5d53a29c183f86fc569661b7c Mon Sep 17 00:00:00 2001 -From: Saul Wold -Date: Sun, 9 Mar 2014 15:22:15 +0200 -Subject: [PATCH] Fix parallel make failure for archives - -Upstream-Status: Pending - -The lib and gnuefi makefiles were using the lib.a() form which compiles -and ar's as a pair instead of compiling all and then ar'ing which can -parallelize better. This was resulting in build failures on larger values -of -j. - -See http://www.chemie.fu-berlin.de/chemnet/use/info/make/make_toc.html#TOC105 -for details. - -Signed-off-by: Saul Wold -Signed-off-by: Darren Hart -[Rebased for 3.0.6] -Signed-off-by: California Sullivan -[Rebased for 3.0.8] -Signed-off-by: Yi Zhao ---- - lib/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/Makefile b/lib/Makefile -index ec1f9e3..79a794d 100644 ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -75,7 +75,7 @@ libsubdirs: - $(OBJS): libsubdirs - - libefi.a: $(OBJS) -- $(AR) $(ARFLAGS) $@ $^ -+ $(AR) $(ARFLAGS) $@ $(OBJS) - - clean: - @rm -vf libefi.a *~ $(OBJS) */*.o --- -2.25.1 - diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.18.bb b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.18.bb index 092e7ed863f..b08aede69f2 100644 --- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.18.bb +++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.18.bb @@ -13,7 +13,6 @@ LIC_FILES_CHKSUM = "file://gnuefi/crt0-efi-arm.S;beginline=4;endline=16;md5=e582 " SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/files/${BP}.tar.bz2 \ - file://0001-Fix-parallel-make-failure-for-archives.patch \ file://0002-Do-not-treat-warnings-as-errors.patch \ " SRC_URI[sha256sum] = "7f212c96ee66547eeefb531267b641e5473d7d8529f0bd8ccdefd33cf7413f5c" From patchwork Fri Nov 29 17:38:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 53380 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 1EF23D729F0 for ; Fri, 29 Nov 2024 17:38:16 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.119633.1732901892753633104 for ; Fri, 29 Nov 2024 09:38:12 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id BCFE711FB for ; Fri, 29 Nov 2024 09:38:41 -0800 (PST) Received: from cesw-amp-gbt-1s-m12830-04.oss.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id E56D03F66E for ; Fri, 29 Nov 2024 09:38:11 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/4] gnu-efi: fix license Date: Fri, 29 Nov 2024 17:38:02 +0000 Message-Id: <20241129173803.3499627-3-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241129173803.3499627-1-ross.burton@arm.com> References: <20241129173803.3499627-1-ross.burton@arm.com> 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 ; Fri, 29 Nov 2024 17:38:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/208028 gnu-efi is a mix of BSD and GPL licensed source code, not a choice between the two. Signed-off-by: Ross Burton --- meta/recipes-bsp/gnu-efi/gnu-efi_3.0.18.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.18.bb b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.18.bb index b08aede69f2..db77f30aaf4 100644 --- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.18.bb +++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.18.bb @@ -2,7 +2,7 @@ SUMMARY = "Libraries for producing EFI binaries" HOMEPAGE = "http://sourceforge.net/projects/gnu-efi/" DESCRIPTION = "GNU-EFI aims to Develop EFI applications for ARM-64, ARM-32, x86_64, IA-64 (IPF), IA-32 (x86), and MIPS platforms using the GNU toolchain and the EFI development environment." SECTION = "devel" -LICENSE = "GPL-2.0-or-later | BSD-2-Clause" +LICENSE = "GPL-2.0-or-later & BSD-2-Clause" LIC_FILES_CHKSUM = "file://gnuefi/crt0-efi-arm.S;beginline=4;endline=16;md5=e582764a4776e60c95bf9ab617343d36 \ file://gnuefi/crt0-efi-aarch64.S;beginline=4;endline=16;md5=e582764a4776e60c95bf9ab617343d36 \ file://inc/efishellintf.h;beginline=13;endline=20;md5=202766b79d708eff3cc70fce15fb80c7 \ From patchwork Fri Nov 29 17:38:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 53383 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 3E006D729F1 for ; Fri, 29 Nov 2024 17:38:16 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.119634.1732901893236993492 for ; Fri, 29 Nov 2024 09:38:13 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 6408811FB for ; Fri, 29 Nov 2024 09:38:42 -0800 (PST) Received: from cesw-amp-gbt-1s-m12830-04.oss.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 957E53F66E for ; Fri, 29 Nov 2024 09:38:12 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 4/4] gnu-efi: upgrade to 4.0.0 Date: Fri, 29 Nov 2024 17:38:03 +0000 Message-Id: <20241129173803.3499627-4-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241129173803.3499627-1-ross.burton@arm.com> References: <20241129173803.3499627-1-ross.burton@arm.com> 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 ; Fri, 29 Nov 2024 17:38:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/208029 gnu-efi isn't making releases on SourceForge anymore, so switch to git clones and track releases on GitHub. License-Update: "Copright" typo fixed. Signed-off-by: Ross Burton --- ...0002-Do-not-treat-warnings-as-errors.patch | 13 +++------- .../{gnu-efi_3.0.18.bb => gnu-efi_4.0.0.bb} | 26 ++++++++++--------- 2 files changed, 17 insertions(+), 22 deletions(-) rename meta/recipes-bsp/gnu-efi/{gnu-efi_3.0.18.bb => gnu-efi_4.0.0.bb} (83%) diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/0002-Do-not-treat-warnings-as-errors.patch b/meta/recipes-bsp/gnu-efi/gnu-efi/0002-Do-not-treat-warnings-as-errors.patch index 37befc8b4c8..84966c484ea 100644 --- a/meta/recipes-bsp/gnu-efi/gnu-efi/0002-Do-not-treat-warnings-as-errors.patch +++ b/meta/recipes-bsp/gnu-efi/gnu-efi/0002-Do-not-treat-warnings-as-errors.patch @@ -15,18 +15,11 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Make.defaults b/Make.defaults -index 0068e31..b643285 100755 +index 1347aca..1834d1c 100755 --- a/Make.defaults +++ b/Make.defaults -@@ -190,7 +190,7 @@ CFLAGS += $(ARCH3264) -g -O2 -Wall -Wextra -Werror \ - -funsigned-char -fshort-wchar -fno-strict-aliasing \ - -ffreestanding -fno-stack-protector +@@ -262,3 +262,3 @@ CFLAGS += $(ARCH3264) -g -O2 -Wall -Wextra -Werror \ else -CFLAGS += $(ARCH3264) -g -O2 -Wall -Wextra -Wno-pointer-sign -Werror \ +CFLAGS += $(ARCH3264) -g -O2 -Wall -Wextra -Wno-pointer-sign \ - -funsigned-char -fshort-wchar -fno-strict-aliasing \ - -ffreestanding -fno-stack-protector -fno-stack-check \ - $(if $(findstring gcc,$(CC)),-fno-merge-all-constants,) --- -2.25.1 - + -fno-strict-aliasing \ diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.18.bb b/meta/recipes-bsp/gnu-efi/gnu-efi_4.0.0.bb similarity index 83% rename from meta/recipes-bsp/gnu-efi/gnu-efi_3.0.18.bb rename to meta/recipes-bsp/gnu-efi/gnu-efi_4.0.0.bb index db77f30aaf4..29d9e695a92 100644 --- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.18.bb +++ b/meta/recipes-bsp/gnu-efi/gnu-efi_4.0.0.bb @@ -3,24 +3,26 @@ HOMEPAGE = "http://sourceforge.net/projects/gnu-efi/" DESCRIPTION = "GNU-EFI aims to Develop EFI applications for ARM-64, ARM-32, x86_64, IA-64 (IPF), IA-32 (x86), and MIPS platforms using the GNU toolchain and the EFI development environment." SECTION = "devel" LICENSE = "GPL-2.0-or-later & BSD-2-Clause" -LIC_FILES_CHKSUM = "file://gnuefi/crt0-efi-arm.S;beginline=4;endline=16;md5=e582764a4776e60c95bf9ab617343d36 \ - file://gnuefi/crt0-efi-aarch64.S;beginline=4;endline=16;md5=e582764a4776e60c95bf9ab617343d36 \ - file://inc/efishellintf.h;beginline=13;endline=20;md5=202766b79d708eff3cc70fce15fb80c7 \ - file://lib/arm/math.c;beginline=2;endline=15;md5=8ed772501da77b2b3345aa6df8744c9e \ - file://lib/arm/initplat.c;beginline=2;endline=15;md5=8ed772501da77b2b3345aa6df8744c9e \ - file://lib/aarch64/math.c;beginline=2;endline=15;md5=8ed772501da77b2b3345aa6df8744c9e \ - file://lib/aarch64/initplat.c;beginline=2;endline=15;md5=8ed772501da77b2b3345aa6df8744c9e \ +LIC_FILES_CHKSUM = "file://gnuefi/crt0-efi-arm.S;beginline=4;endline=16;md5=8b0a86085b86eda7a3c7e8a1eb7ec753 \ + file://gnuefi/crt0-efi-aarch64.S;beginline=4;endline=16;md5=8b0a86085b86eda7a3c7e8a1eb7ec753 \ + file://inc/efishellintf.h;beginline=13;endline=20;md5=ee14c1530c341a7050837adead6bc9a5 \ + file://lib/arm/math.c;beginline=2;endline=15;md5=ccb5c6b51053d1ee7277539ec38513d7 \ + file://lib/arm/initplat.c;beginline=2;endline=15;md5=ccb5c6b51053d1ee7277539ec38513d7 \ + file://lib/aarch64/math.c;beginline=2;endline=15;md5=ccb5c6b51053d1ee7277539ec38513d7 \ + file://lib/aarch64/initplat.c;beginline=2;endline=15;md5=ccb5c6b51053d1ee7277539ec38513d7 \ " -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/files/${BP}.tar.bz2 \ +COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*|riscv64.*)-linux" +COMPATIBLE_HOST:armv4 = 'null' + +SRC_URI = "git://github.com/ncroxon/gnu-efi;protocol=https;branch=master \ file://0002-Do-not-treat-warnings-as-errors.patch \ " -SRC_URI[sha256sum] = "7f212c96ee66547eeefb531267b641e5473d7d8529f0bd8ccdefd33cf7413f5c" +SRCREV = "5ea320f0f01c8de8f9dd4e4e38a245608f0287dd" -inherit sourceforge-releases +S = "${WORKDIR}/git" -COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*|riscv64.*)-linux" -COMPATIBLE_HOST:armv4 = 'null' +inherit github-releases do_configure:linux-gnux32:prepend() { cp ${STAGING_INCDIR}/gnu/stubs-x32.h ${STAGING_INCDIR}/gnu/stubs-64.h