From 4e3cb6cbe40515a30dece61bc95b25752ea95277 Mon Sep 17 00:00:00 2001 From: Ziad Elhanafy Date: Wed, 19 Jul 2023 16:54:47 +0100 Subject: [PATCH] arm: Set FVP EULA environment variable details message 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 Signed-off-by: Jon Mason --- 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