@@ -29,7 +29,7 @@ local_conf_header:
BB_SERVER_TIMEOUT = "60"
CONF_VERSION = "2"
PACKAGE_CLASSES = "package_ipk"
- LICENSE_FLAGS_WHITELIST += "armcompiler Arm-FVP-EULA"
+ LICENSE_FLAGS_ACCEPTED += "armcompiler Arm-FVP-EULA"
PACKAGECONFIG:remove:pn-qemu-system-native = "gtk+ sdl"
EXTRA_IMAGE_FEATURES:append = " debug-tweaks"
BB_NUMBER_THREADS = "16"
@@ -37,7 +37,7 @@ local_conf_header:
base: |
CONF_VERSION = "2"
PACKAGE_CLASSES = "package_ipk"
- LICENSE_FLAGS_WHITELIST += "armcompiler"
+ LICENSE_FLAGS_ACCEPTED += "armcompiler"
BB_NUMBER_THREADS ?= "16"
PARALLEL_MAKE ?= "-j16"
PACKAGECONFIG:append:pn-perf = " coresight"
@@ -35,7 +35,7 @@ local_conf_header:
PACKAGECONFIG:remove:pn-qemu-system-native = "gtk+ sdl"
EXTRA_IMAGE_FEATURES:append = " debug-tweaks"
IMAGE_CLASSES:append = " ${@oe.utils.ifelse(d.getVar('FVP_BASE_R_AEM_TARBALL_URI'), 'fvpboot', '')}"
- LICENSE_FLAGS_WHITELIST:append = " ${@oe.utils.vartrue('FVP_BASE_R_ARM_EULA_ACCEPT', 'Arm-FVP-EULA', '', d)}"
+ LICENSE_FLAGS_ACCEPTED:append = " ${@oe.utils.vartrue('FVP_BASE_R_ARM_EULA_ACCEPT', 'Arm-FVP-EULA', '', d)}"
target:
- core-image-minimal
@@ -22,7 +22,7 @@ NO_GENERIC_LICENSE[Armcompiler-Supplementary-terms] = "license_terms/supplementa
NO_GENERIC_LICENSE[Armcompiler-Third-party-licenses] = "license_terms/third_party_licenses.txt"
# The Arm Compiler is under a EULA, read this at the homepage above and if you
-# agree add 'armcompiler' to your LICENSE_FLAGS_WHITELIST.
+# agree add 'armcompiler' to your LICENSE_FLAGS_ACCEPTED.
LICENSE_FLAGS = "armcompiler"
LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=19faf912b534478d28f60dfa24659c17 \
@@ -1,7 +1,7 @@
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_WHITELIST if you agree to these terms.
+# LICENSE_FLAGS_ACCEPTED if you agree to these terms.
LICENSE_FLAGS = "Arm-FVP-EULA"
LICENSE = "Proprietary & Apache-2.0 & Python-2.0 & GPL-3.0-with-GCC-exception & Zlib & NCSA & LGPLv2+ & MIT & BSD-3-Clause"
LICENSE_FLAGS_WHITELIST has been renamed to LICENSE_FLAGS_ACCEPTED in oe-core master. Signed-off-by: Ross Burton <ross.burton@arm.com> --- ci/base.yml | 2 +- kas/corstone1000-base.yml | 2 +- kas/fvp-baser-aemv8r64-bsp.yml | 2 +- .../recipes-devtools/external-arm-toolchain/armcompiler_6.17.bb | 2 +- meta-arm/recipes-devtools/fvp/fvp-common.inc | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)