From patchwork Wed Jul 19 15:54:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ziad.elhanafy@arm.com X-Patchwork-Id: 27712 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 83734EB64DA for ; Wed, 19 Jul 2023 15:55:10 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.900.1689782109712014291 for ; Wed, 19 Jul 2023 08:55:10 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ziad.elhanafy@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 6E5E52F4; Wed, 19 Jul 2023 08:55:52 -0700 (PDT) Received: from e128087.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 21F243F67D; Wed, 19 Jul 2023 08:55:07 -0700 (PDT) From: ziad.elhanafy@arm.com To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com, Ziad Elhanafy , Ziad Elhanafy Subject: [PATCH 1/3] arm: Set FVP EULA environment variable details message Date: Wed, 19 Jul 2023 16:54:47 +0100 Message-Id: <20230719155449.3456824-1-ziad.elhanafy@arm.com> X-Mailer: git-send-email 2.25.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 ; Wed, 19 Jul 2023 15:55:10 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4904 From: Ziad Elhanafy Set the FVP EULA environment variable details message to request the user to accept the EULA in case it has not been accepted. Signed-off-by: Ziad Elhanafy --- meta-arm/recipes-devtools/fvp/fvp-common.inc | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/meta-arm/recipes-devtools/fvp/fvp-common.inc b/meta-arm/recipes-devtools/fvp/fvp-common.inc index ea3ef678..a20959b7 100644 --- a/meta-arm/recipes-devtools/fvp/fvp-common.inc +++ b/meta-arm/recipes-devtools/fvp/fvp-common.inc @@ -1,12 +1,20 @@ HOMEPAGE = "https://developer.arm.com/tools-and-software/simulation-models/fixed-virtual-platforms" -# FVP has an End User License Agreement. Add Arm-FVP-EULA to your -# LICENSE_FLAGS_ACCEPTED if you agree to these terms. LICENSE_FLAGS = "Arm-FVP-EULA" -LICENSE_FLAGS_DETAILS[Arm-FVP-EULA] = "https://developer.arm.com/downloads/-/arm-ecosystem-fvps/eula" - LICENSE = "Proprietary & Apache-2.0 & Python-2.0 & GPL-3.0-with-GCC-exception & Zlib & NCSA & LGPL-2.0-or-later & MIT & BSD-3-Clause" +# FVP has an End User License Agreement. Add Arm-FVP-EULA to +# LICENSE_FLAGS_ACCEPTED if the EULA has been accepted, so it can +# be later checked if the user accepted the EULA or not and if +# not display a message to the user requesting them to do so. +LICENSE_FLAGS_ACCEPTED:append = " ${@oe.utils.vartrue('ARM_FVP_EULA_ACCEPT', 'Arm-FVP-EULA', '', d)}" + +LICENSE_FLAGS_DETAILS[Arm-FVP-EULA] = " \ +Accept the END USER LICENSE AGREEMENT FOR ARM SOFTWARE DEVELOPMENT TOOLS. \ +Please refer to 'https://developer.arm.com/downloads/-/arm-ecosystem-fvps/eula'\ +${@bb.utils.contains('BB_ENV_PASSTHROUGH_ADDITIONS', 'ARM_FVP_EULA_ACCEPT', ' and export ARM_FVP_EULA_ACCEPT to 1', '', d)}.\ +" + COMPATIBLE_HOST = "x86_64.*-linux" # The architecture-specific download filename suffix From patchwork Wed Jul 19 15:54:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ziad.elhanafy@arm.com X-Patchwork-Id: 27713 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 74DF8EB64DA for ; Wed, 19 Jul 2023 15:55:20 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.903.1689782118977751774 for ; Wed, 19 Jul 2023 08:55:19 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ziad.elhanafy@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 6D22F2F4; Wed, 19 Jul 2023 08:56:01 -0700 (PDT) Received: from e128087.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 24CEA3F67D; Wed, 19 Jul 2023 08:55:16 -0700 (PDT) From: ziad.elhanafy@arm.com To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com, Ziad Elhanafy Subject: [PATCH 2/3] kas: Add fvp-eula.yml and remove license related settings Date: Wed, 19 Jul 2023 16:54:48 +0100 Message-Id: <20230719155449.3456824-2-ziad.elhanafy@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230719155449.3456824-1-ziad.elhanafy@arm.com> References: <20230719155449.3456824-1-ziad.elhanafy@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 ; Wed, 19 Jul 2023 15:55:20 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4905 From: Ziad Elhanafy 1- Add fvp-eula.yml file which introduces ARM_FVP_EULA_ACCEPT environment variable 2- Remove any license related settings from fvp-baser-aemv8r64-bsp.yml, corstone500.yml and corstone1000-fvp.yml Signed-off-by: Ziad Elhanafy --- kas/corstone1000-fvp.yml | 2 +- kas/corstone500.yml | 3 ++- kas/fvp-baser-aemv8r64-bsp.yml | 6 ++---- kas/fvp-eula.yml | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 kas/fvp-eula.yml diff --git a/kas/corstone1000-fvp.yml b/kas/corstone1000-fvp.yml index d0d10a73..7d23a53a 100644 --- a/kas/corstone1000-fvp.yml +++ b/kas/corstone1000-fvp.yml @@ -2,6 +2,7 @@ header: version: 11 includes: - kas/corstone1000-base.yml + - kas/fvp-eula.yml machine: corstone1000-fvp @@ -10,7 +11,6 @@ local_conf_header: # Remove Dropbear SSH as it will not fit into the corstone1000 image. IMAGE_FEATURES:remove = " ssh-server-dropbear" INHERIT = " ${@bb.utils.contains('BUILD_ARCH', 'x86_64', 'fvpboot', '', d)}" - LICENSE_FLAGS_ACCEPTED:append = " Arm-FVP-EULA" target: - corstone1000-image diff --git a/kas/corstone500.yml b/kas/corstone500.yml index f1587b44..d40b59df 100644 --- a/kas/corstone500.yml +++ b/kas/corstone500.yml @@ -1,5 +1,7 @@ header: version: 11 + includes: + - kas/fvp-eula.yml distro: poky-tiny @@ -38,7 +40,6 @@ local_conf_header: PACKAGECONFIG:append:pn-perf = " coresight" fvp-config: | IMAGE_CLASSES:append = " ${@bb.utils.contains('BUILD_ARCH', 'x86_64', 'fvpboot', '', d)}" - LICENSE_FLAGS_ACCEPTED:append = " Arm-FVP-EULA" machine: corstone500 diff --git a/kas/fvp-baser-aemv8r64-bsp.yml b/kas/fvp-baser-aemv8r64-bsp.yml index dd175d03..9f16a3f9 100644 --- a/kas/fvp-baser-aemv8r64-bsp.yml +++ b/kas/fvp-baser-aemv8r64-bsp.yml @@ -1,5 +1,7 @@ header: version: 9 + includes: + - kas/fvp-eula.yml distro: poky machine: fvp-baser-aemv8r64 @@ -24,9 +26,6 @@ repos: meta: meta-poky: -env: - FVP_BASE_R_ARM_EULA_ACCEPT: "False" - local_conf_header: base: | CONF_VERSION = "2" @@ -34,7 +33,6 @@ local_conf_header: PACKAGECONFIG:remove:pn-qemu-system-native = "gtk+ sdl" EXTRA_IMAGE_FEATURES:append = " debug-tweaks ssh-server-openssh" CORE_IMAGE_EXTRA_INSTALL:append = " ssh-pregen-hostkeys" - LICENSE_FLAGS_ACCEPTED:append = " ${@oe.utils.vartrue('FVP_BASE_R_ARM_EULA_ACCEPT', 'Arm-FVP-EULA', '', d)}" IMAGE_CLASSES:append = " testimage" target: diff --git a/kas/fvp-eula.yml b/kas/fvp-eula.yml new file mode 100644 index 00000000..ab1fae0e --- /dev/null +++ b/kas/fvp-eula.yml @@ -0,0 +1,5 @@ +header: + version: 13 + +env: + ARM_FVP_EULA_ACCEPT: From patchwork Wed Jul 19 15:54:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ziad.elhanafy@arm.com X-Patchwork-Id: 27714 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 744F9EB64DA for ; Wed, 19 Jul 2023 15:55:30 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.909.1689782124994369593 for ; Wed, 19 Jul 2023 08:55:25 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ziad.elhanafy@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 DC8582F4; Wed, 19 Jul 2023 08:56:07 -0700 (PDT) Received: from e128087.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 C47983F67D; Wed, 19 Jul 2023 08:55:23 -0700 (PDT) From: ziad.elhanafy@arm.com To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com, Ziad Elhanafy Subject: [PATCH 3/3] arm-bsp/documentation: Replace FVP_BASE_R_ARM_EULA_ACCEPT with ARM_FVP_EULA_ACCEPT Date: Wed, 19 Jul 2023 16:54:49 +0100 Message-Id: <20230719155449.3456824-3-ziad.elhanafy@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230719155449.3456824-1-ziad.elhanafy@arm.com> References: <20230719155449.3456824-1-ziad.elhanafy@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 ; Wed, 19 Jul 2023 15:55:30 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4906 From: Ziad Elhanafy 1- Replace FVP_BASE_R_ARM_EULA_ACCEPT with ARM_FVP_EULA_ACCEPT in fvp-baser-aemv8r64.md 2- Add instructions to corstone1000/user-guide.rst to set ARM_FVP_EULA_ACCEPT to "1". Signed-off-by: Ziad Elhanafy --- meta-arm-bsp/documentation/corstone1000/user-guide.rst | 10 +++++++++- meta-arm-bsp/documentation/fvp-baser-aemv8r64.md | 6 +++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/meta-arm-bsp/documentation/corstone1000/user-guide.rst b/meta-arm-bsp/documentation/corstone1000/user-guide.rst index a5ccb313..96dee072 100644 --- a/meta-arm-bsp/documentation/corstone1000/user-guide.rst +++ b/meta-arm-bsp/documentation/corstone1000/user-guide.rst @@ -176,7 +176,15 @@ To build a Corstone-1000 image for MPS3 FPGA, run: kas build meta-arm/kas/corstone1000-mps3.yml -Alternatively, to build a Corstone-1000 image for FVP, run: +Alternatively, to build a Corstone-1000 image for FVP, you need to accept +the EULA at https://developer.arm.com/downloads/-/arm-ecosystem-fvps/eula +by setting the ARM_FVP_EULA_ACCEPT environment variable as follows: + +:: + + export ARM_FVP_EULA_ACCEPT="True" + +then run: :: diff --git a/meta-arm-bsp/documentation/fvp-baser-aemv8r64.md b/meta-arm-bsp/documentation/fvp-baser-aemv8r64.md index e29aad34..00efed47 100644 --- a/meta-arm-bsp/documentation/fvp-baser-aemv8r64.md +++ b/meta-arm-bsp/documentation/fvp-baser-aemv8r64.md @@ -110,7 +110,7 @@ the EULA at https://developer.arm.com/downloads/-/arm-ecosystem-fvps/eula by setting the following environment variable: - FVP_BASE_R_ARM_EULA_ACCEPT="True" + ARM_FVP_EULA_ACCEPT="True" **Note:** The host machine should have at least 50 GBytes of free disk space for the next steps to work correctly. @@ -134,13 +134,13 @@ Fetch the meta-arm repository into a build directory: Building with the standard Linux kernel: cd ~/fvp-baser-aemv8r64-build - export FVP_BASE_R_ARM_EULA_ACCEPT="True" + export ARM_FVP_EULA_ACCEPT="True" kas build meta-arm/kas/fvp-baser-aemv8r64-bsp.yml Building with the Real-Time Linux kernel (PREEMPT\_RT): cd ~/fvp-baser-aemv8r64-build - export FVP_BASE_R_ARM_EULA_ACCEPT="True" + export ARM_FVP_EULA_ACCEPT="True" kas build meta-arm/kas/fvp-baser-aemv8r64-rt-bsp.yml ### Run