From 71e8ca62ddf898c6278ec5d89af32afebf54ac9d Mon Sep 17 00:00:00 2001 From: Kory Maincent Date: Wed, 1 Oct 2025 14:58:25 +0000 Subject: [PATCH] optee-os: Add support for custom license files The OP-TEE OS package was not providing any license file when a custom Linux version was selected. Fix this by adding a Kconfig option to specify the license file, with a default value set to the commonly used license paths. Signed-off-by: Kory Maincent [Arnout: use a single Kconfig option with conditional prompt] Signed-off-by: Arnout Vandecappelle --- boot/optee-os/Config.in | 8 ++++++++ boot/optee-os/optee-os.mk | 4 +--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index e737d2a0ac..4bd7debefd 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -86,6 +86,14 @@ config BR2_TARGET_OPTEE_OS_VERSION default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ if BR2_TARGET_OPTEE_OS_CUSTOM_GIT +config BR2_TARGET_OPTEE_OS_LICENSE_FILES + string "OP-TEE OS license files" if BR2_TARGET_OPTEE_OS_CUSTOM_GIT || \ + BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL + default "LICENSE" + help + A space-separated list of license files related to the + OPTEE-OS package. + config BR2_TARGET_OPTEE_OS_NEEDS_DTC bool "OP-TEE OS needs dtc" select BR2_PACKAGE_HOST_DTC diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 25c917e2fc..1639597407 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -6,9 +6,7 @@ OPTEE_OS_VERSION = $(call qstrip,$(BR2_TARGET_OPTEE_OS_VERSION)) OPTEE_OS_LICENSE = BSD-2-Clause -ifeq ($(BR2_TARGET_OPTEE_OS_LATEST),y) -OPTEE_OS_LICENSE_FILES = LICENSE -endif +OPTEE_OS_LICENSE_FILES = $(call qstrip,$(BR2_TARGET_OPTEE_OS_LICENSE_FILES)) OPTEE_OS_CPE_ID_PREFIX = cpe:2.3:o OPTEE_OS_CPE_ID_VENDOR = linaro