mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-08-08 00:20:38 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/optee-examples: add support for custom tarball

Browse Source 
OP-TEE OS supports custom tarballs. If the OP-TEE OS custom tarball version
does not match the latest optee-examples version supported by Buildroot,
optee-examples might not build or run properly. This patch adds support for
an optee-examples custom tarball URL to address this potential issue.

Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
Acked-by: Etienne Carriere <etienne.carriere@foss.st.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Kory Maincent
2024-06-20 16:38:53 +02:00
committed by Thomas Petazzoni
parent 9826d06cb3
commit 500ff76216
2 changed files with 61 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
package/optee-examples/Config.in
View File

@@ -26,3 +26,45 @@ comment "optee-examples needs a toolchain w/ threads, dynamic library, headers >
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \
!BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3
if BR2_PACKAGE_OPTEE_EXAMPLES
choice
prompt "optee-examples version"
default BR2_PACKAGE_OPTEE_EXAMPLES_LATEST
help
Select the version of optee-examples you want to use
config BR2_PACKAGE_OPTEE_EXAMPLES_LATEST
bool "4.3.0"
help
Use the latest release tag from the optee-examples official
Git repository.
config BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_TARBALL
bool "Custom tarball"
help
This option allows to specify a URL pointing to an
optee-examples source tarball. This URL can use any protocol
recognized by Buildroot, like http://, ftp://, file:// or
scp://.
When pointing to a local tarball using file://, you may want
to use a make variable like $(TOPDIR) to reference the root of
the Buildroot tree.
endchoice
if BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_TARBALL
config BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_TARBALL_LOCATION
string "URL of custom optee-examples tarball"
endif
config BR2_PACKAGE_OPTEE_EXAMPLES_VERSION
string
default "4.3.0" if BR2_PACKAGE_OPTEE_EXAMPLES_LATEST
default "custom" if BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_TARBALL
endif # BR2_PACKAGE_OPTEE_EXAMPLES

21
package/optee-examples/optee-examples.mk
View File

@@ -4,11 +4,22 @@
# #
################################################################################ ################################################################################
OPTEE_EXAMPLES_VERSION = 4.3.0 OPTEE_EXAMPLES_VERSION = $(call qstrip,$(BR2_PACKAGE_OPTEE_EXAMPLES_VERSION))
OPTEE_EXAMPLES_SITE = $(call github,linaro-swg,optee_examples,$(OPTEE_EXAMPLES_VERSION))
OPTEE_EXAMPLES_LICENSE = BSD-2-Clause OPTEE_EXAMPLES_LICENSE = BSD-2-Clause
OPTEE_EXAMPLES_LICENSE_FILES = LICENSE OPTEE_EXAMPLES_LICENSE_FILES = LICENSE
ifeq ($(BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_TARBALL),y)
OPTEE_EXAMPLES_TARBALL = $(call qstrip,$(BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_TARBALL_LOCATION))
OPTEE_EXAMPLES_SITE = $(patsubst %/,%,$(dir $(OPTEE_EXAMPLES_TARBALL)))
OPTEE_EXAMPLES_SOURCE = $(notdir $(OPTEE_EXAMPLES_TARBALL))
else
OPTEE_EXAMPLES_SITE = $(call github,linaro-swg,optee_examples,$(OPTEE_EXAMPLES_VERSION))
endif
ifeq ($(BR2_PACKAGE_OPTEE_EXAMPLES):$(BR2_PACKAGE_OPTEE_EXAMPLES_LATEST),y:)
BR_NO_CHECK_HASH_FOR += $(OPTEE_EXAMPLES_SOURCE)
endif
OPTEE_EXAMPLES_DEPENDENCIES = optee-client optee-os OPTEE_EXAMPLES_DEPENDENCIES = optee-client optee-os
# Trusted Application are not built from CMake due to ta_dev_kit dependencies. # Trusted Application are not built from CMake due to ta_dev_kit dependencies.
@@ -28,4 +39,10 @@ endef
OPTEE_EXAMPLES_POST_BUILD_HOOKS += OPTEE_EXAMPLES_BUILD_TAS OPTEE_EXAMPLES_POST_BUILD_HOOKS += OPTEE_EXAMPLES_BUILD_TAS
OPTEE_EXAMPLES_POST_INSTALL_TARGET_HOOKS += OPTEE_EXAMPLES_INSTALL_TAS OPTEE_EXAMPLES_POST_INSTALL_TARGET_HOOKS += OPTEE_EXAMPLES_INSTALL_TAS
ifeq ($(BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_TARBALL)$(BR_BUILDING),yy)
ifeq ($(call qstrip,$(BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_TARBALL_LOCATION)),)
$(error No tarball location specified. Please check BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_TARBALL_LOCATION)
endif
endif
$(eval $(cmake-package)) $(eval $(cmake-package))