Skip to contentSkip to conversation

Support custom tarball for OP-TEE related projects

PATCH In review Kory Maincent via buildroot 2 participants 10 messages Jun 20, 2024 – Aug 2, 2024

lore
Share & tools
lore
#0 lore raw

cover Support custom tarball for OP-TEE related projects

OP-TEE OS supports custom tarballs, but the optee-client, optee-test, and optee-examples projects do not. This might cause version mismatches between OP-TEE OS and these related projects.

This patch series adds support for custom tarball URLs to address these potential issues.

Kory Maincent (3):
package/optee-client: Add support for custom tarball package/optee-test: Add support for custom tarball package/optee-examples: Add support for custom tarball

 package/optee-client/Config.in           | 38 +++++++++++++++++++++
 package/optee-client/optee-client.mk     | 24 ++++++++++++--
 package/optee-examples/Config.in         | 42 ++++++++++++++++++++++++
 package/optee-examples/optee-examples.mk | 26 +++++++++++++--
 package/optee-test/Config.in             | 41 +++++++++++++++++++++++
 package/optee-test/optee-test.mk         | 23 +++++++++++--
 6 files changed, 188 insertions(+), 6 deletions(-)
Signature · 6 lines
2.25.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

PATCH 1/3 package/optee-client: Add support for custom tarball

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

---
 package/optee-client/Config.in       | 38 ++++++++++++++++++++++++++++
 package/optee-client/optee-client.mk | 24 ++++++++++++++++--
 2 files changed, 60 insertions(+), 2 deletions(-)
package/optee-client/Config.in +38 -0
index 4061164cbb..3a59ce9725 100644
@@ -17,6 +17,44 @@ config BR2_PACKAGE_OPTEE_CLIENT
 
 if BR2_PACKAGE_OPTEE_CLIENT
 
+choice
+	prompt "optee-client version"
+	default BR2_PACKAGE_OPTEE_CLIENT_LATEST
+	help
+	  Select the version of optee-client you want to use
+
+config BR2_PACKAGE_OPTEE_CLIENT_LATEST
+	bool "4.2.0"
+	help
+	  Use the latest release tag from the optee-client official Git
+	  repository.
+
+config BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL
+	bool "Custom tarball"
+	help
+	  This option allows to specify a URL pointing to an
+	  optee-client 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_CLIENT_CUSTOM_TARBALL
+
+config BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL_LOCATION
+	string "URL of custom optee-client tarball"
+
+endif
+
+config BR2_PACKAGE_OPTEE_CLIENT_VERSION
+	string
+	default "4.2.0"		if BR2_PACKAGE_OPTEE_CLIENT_LATEST
+	default "custom"	if BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL
+
 config BR2_PACKAGE_OPTEE_CLIENT_TEE_FS_PATH
 	string "Path for normal world OS secure storage"
 	default "/data/tee"
package/optee-client/optee-client.mk +22 -2
index 6600a9c4fc..a91548a43b 100644
@@ -4,10 +4,24 @@
 #
 ################################################################################
 
-OPTEE_CLIENT_VERSION = 4.2.0
-OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION))
+OPTEE_CLIENT_VERSION = $(call qstrip,$(BR2_PACKAGE_OPTEE_CLIENT_VERSION))
 OPTEE_CLIENT_LICENSE = BSD-2-Clause
+ifeq ($(BR2_PACKAGE_OPTEE_CLIENT_LATEST),y)
 OPTEE_CLIENT_LICENSE_FILES = LICENSE
+endif
+
+ifeq ($(BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL),y)
+OPTEE_CLIENT_TARBALL = $(call qstrip,$(BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL_LOCATION))
+OPTEE_CLIENT_SITE = $(patsubst %/,%,$(dir $(OPTEE_CLIENT_TARBALL)))
+OPTEE_CLIENT_SOURCE = $(notdir $(OPTEE_CLIENT_TARBALL))
+else
+OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION))
+endif
+
+ifeq ($(BR2_PACKAGE_OPTEE_CLIENT):$(BR2_PACKAGE_OPTEE_CLIENT_LATEST),y:)
+BR_NO_CHECK_HASH_FOR += $(OPTEE_CLIENT_SOURCE)
+endif
+
 OPTEE_CLIENT_INSTALL_STAGING = YES
 
 OPTEE_CLIENT_CONF_OPTS = \
@@ -38,4 +52,10 @@ define OPTEE_CLIENT_INSTALL_INIT_SYSV
 		$(TARGET_DIR)/etc/init.d/S30tee-supplicant
 endef
 
+ifeq ($(BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL)$(BR_BUILDING),yy)
+ifeq ($(call qstrip,$(BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL_LOCATION)),)
+$(error No tarball location specified. Please check BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL_LOCATION)
+endif
+endif
+
 $(eval $(cmake-package))
Signature · 6 lines
2.25.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Acked-by on v1 1/3
#2 lore raw

Re: [Buildroot] [PATCH 1/3] package/optee-client: Add support for custom tarball

Hi Kory,

Quoted 11 lines · Kory Maincent

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

---
 package/optee-client/Config.in       | 38 ++++++++++++++++++++++++++++
 package/optee-client/optee-client.mk | 24 ++++++++++++++++--
 2 files changed, 60 insertions(+), 2 deletions(-)
Quoted 92 lines
package/optee-client/Config.in +38 -0
index 4061164cbb..3a59ce9725 100644
@@ -17,6 +17,44 @@ config BR2_PACKAGE_OPTEE_CLIENT
 
 if BR2_PACKAGE_OPTEE_CLIENT
 
+choice
+       prompt "optee-client version"
+       default BR2_PACKAGE_OPTEE_CLIENT_LATEST
+       help
+         Select the version of optee-client you want to use
+
+config BR2_PACKAGE_OPTEE_CLIENT_LATEST
+       bool "4.2.0"
+       help
+         Use the latest release tag from the optee-client official Git
+         repository.
+
+config BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL
+       bool "Custom tarball"
+       help
+         This option allows to specify a URL pointing to an
+         optee-client 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_CLIENT_CUSTOM_TARBALL
+
+config BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL_LOCATION
+       string "URL of custom optee-client tarball"
+
+endif
+
+config BR2_PACKAGE_OPTEE_CLIENT_VERSION
+       string
+       default "4.2.0"         if BR2_PACKAGE_OPTEE_CLIENT_LATEST
+       default "custom"        if BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL
+
 config BR2_PACKAGE_OPTEE_CLIENT_TEE_FS_PATH
        string "Path for normal world OS secure storage"
        default "/data/tee"
package/optee-client/optee-client.mk +22 -3
index 6600a9c4fc..a91548a43b 100644
@@ -4,10 +4,24 @@
 #
 ################################################################################
 
-OPTEE_CLIENT_VERSION = 4.2.0
-OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION))
+OPTEE_CLIENT_VERSION = $(call qstrip,$(BR2_PACKAGE_OPTEE_CLIENT_VERSION))
 OPTEE_CLIENT_LICENSE = BSD-2-Clause
+ifeq ($(BR2_PACKAGE_OPTEE_CLIENT_LATEST),y)
 OPTEE_CLIENT_LICENSE_FILES = LICENSE
+endif
+
+ifeq ($(BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL),y)
+OPTEE_CLIENT_TARBALL = $(call qstrip,$(BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL_LOCATION))
+OPTEE_CLIENT_SITE = $(patsubst %/,%,$(dir $(OPTEE_CLIENT_TARBALL)))
+OPTEE_CLIENT_SOURCE = $(notdir $(OPTEE_CLIENT_TARBALL))
+else
+OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION))
+endif
+
+ifeq ($(BR2_PACKAGE_OPTEE_CLIENT):$(BR2_PACKAGE_OPTEE_CLIENT_LATEST),y:)
+BR_NO_CHECK_HASH_FOR += $(OPTEE_CLIENT_SOURCE)
+endif
+
 OPTEE_CLIENT_INSTALL_STAGING = YES
 
 OPTEE_CLIENT_CONF_OPTS = \
@@ -38,4 +52,10 @@ define OPTEE_CLIENT_INSTALL_INIT_SYSV
                $(TARGET_DIR)/etc/init.d/S30tee-supplicant
 endef
 
+ifeq ($(BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL)$(BR_BUILDING),yy)
+ifeq ($(call qstrip,$(BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL_LOCATION)),)
+$(error No tarball location specified. Please check BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL_LOCATION)
+endif
+endif
+
 $(eval $(cmake-package))
--
Quoted 3 lines

2.25.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#3 lore raw

Re: [Buildroot] [PATCH 1/3] package/optee-client: Add support for custom tarball

In reply to Kory Maincent via buildroot
Quoted 10 lines · On Thu, 20 Jun 2024 16:38:51 +0200 Kory Maincent via buildroot…

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

---
 package/optee-client/Config.in       | 38 ++++++++++++++++++++++++++++
 package/optee-client/optee-client.mk | 24 ++++++++++++++++--
 2 files changed, 60 insertions(+), 2 deletions(-)

Thanks, series applied!

I just dropped the:

ifeq ($(BR2_PACKAGE_OPTEE_CLIENT_LATEST),y)

around the LICENSE_FILES. Indeed, we can now override the hash files in a per-configuration basis, so this should no longer be needed.

Thanks!

Thomas

Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#4 lore raw

PATCH 2/3 package/optee-test: Add support for custom tarball

In reply to Kory Maincent via buildroot

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

---
 package/optee-test/Config.in     | 41 ++++++++++++++++++++++++++++++++
 package/optee-test/optee-test.mk | 23 ++++++++++++++++--
 2 files changed, 62 insertions(+), 2 deletions(-)
package/optee-test/Config.in +41 -0
index 57a7834c75..1c4dbf7fb4 100644
@@ -31,3 +31,44 @@ comment "optee-test needs a toolchain w/ threads, C++, dynamic library, headers
 	depends on BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \
 		BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3
+
+if BR2_PACKAGE_OPTEE_TEST
+
+choice
+	prompt "optee-test version"
+	default BR2_PACKAGE_OPTEE_TEST_LATEST if BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
+	help
+	  Select the version of optee-test you want to use
+
+config BR2_PACKAGE_OPTEE_TEST_LATEST
+	bool "4.2.0"
+	help
+	  Use the latest release tag from the optee-test official Git
+	  repository.
+
+config BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL
+	bool "Custom tarball"
+	help
+	  This option allows to specify a URL pointing to an optee-test
+	  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_TEST_CUSTOM_TARBALL
+
+config BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL_LOCATION
+	string "URL of custom optee-test tarball"
+
+endif
+
+config BR2_PACKAGE_OPTEE_TEST_VERSION
+	string
+	default "4.2.0"		if BR2_PACKAGE_OPTEE_TEST_LATEST
+	default "custom"	if BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL
+
+endif # BR2_PACKAGE_OPTEE_TEST
package/optee-test/optee-test.mk +21 -2
index 69e84fdbd2..9bc074b215 100644
@@ -4,10 +4,23 @@
 #
 ################################################################################
 
-OPTEE_TEST_VERSION = 4.2.0
-OPTEE_TEST_SITE = $(call github,OP-TEE,optee_test,$(OPTEE_TEST_VERSION))
+OPTEE_TEST_VERSION = $(call qstrip,$(BR2_PACKAGE_OPTEE_TEST_VERSION))
 OPTEE_TEST_LICENSE = GPL-2.0, BSD-2-Clause,
+ifeq ($(BR2_PACKAGE_OPTEE_TEST_LATEST),y)
 OPTEE_TEST_LICENSE_FILES = LICENSE.md
+endif
+
+ifeq ($(BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL),y)
+OPTEE_TEST_TARBALL = $(call qstrip,$(BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL_LOCATION))
+OPTEE_TEST_SITE = $(patsubst %/,%,$(dir $(OPTEE_TEST_TARBALL)))
+OPTEE_TEST_SOURCE = $(notdir $(OPTEE_TEST_TARBALL))
+else
+OPTEE_TEST_SITE = $(call github,OP-TEE,optee_test,$(OPTEE_TEST_VERSION))
+endif
+
+ifeq ($(BR2_PACKAGE_OPTEE_TEST):$(BR2_PACKAGE_OPTEE_TEST_LATEST),y:)
+BR_NO_CHECK_HASH_FOR += $(OPTEE_TEST_SOURCE)
+endif
 
 OPTEE_TEST_DEPENDENCIES = optee-client optee-os
 
@@ -34,4 +47,10 @@ endef
 OPTEE_TEST_POST_BUILD_HOOKS += OPTEE_TEST_BUILD_TAS
 OPTEE_TEST_POST_INSTALL_TARGET_HOOKS += OPTEE_TEST_INSTALL_TAS
 
+ifeq ($(BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL)$(BR_BUILDING),yy)
+ifeq ($(call qstrip,$(BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL_LOCATION)),)
+$(error No tarball location specified. Please check BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL_LOCATION)
+endif
+endif
+
 $(eval $(cmake-package))
Signature · 6 lines
2.25.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Acked-by on v1 2/3
#5 lore raw

Re: [Buildroot] [PATCH 2/3] package/optee-test: Add support for custom tarball

Quoted 11 lines · Kory Maincent

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

---
 package/optee-test/Config.in     | 41 ++++++++++++++++++++++++++++++++
 package/optee-test/optee-test.mk | 23 ++++++++++++++++--
 2 files changed, 62 insertions(+), 2 deletions(-)
Quoted 91 lines
package/optee-test/Config.in +41 -0
index 57a7834c75..1c4dbf7fb4 100644
@@ -31,3 +31,44 @@ comment "optee-test needs a toolchain w/ threads, C++, dynamic library, headers
        depends on BR2_USE_MMU
        depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \
                BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3
+
+if BR2_PACKAGE_OPTEE_TEST
+
+choice
+       prompt "optee-test version"
+       default BR2_PACKAGE_OPTEE_TEST_LATEST if BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
+       help
+         Select the version of optee-test you want to use
+
+config BR2_PACKAGE_OPTEE_TEST_LATEST
+       bool "4.2.0"
+       help
+         Use the latest release tag from the optee-test official Git
+         repository.
+
+config BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL
+       bool "Custom tarball"
+       help
+         This option allows to specify a URL pointing to an optee-test
+         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_TEST_CUSTOM_TARBALL
+
+config BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL_LOCATION
+       string "URL of custom optee-test tarball"
+
+endif
+
+config BR2_PACKAGE_OPTEE_TEST_VERSION
+       string
+       default "4.2.0"         if BR2_PACKAGE_OPTEE_TEST_LATEST
+       default "custom"        if BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL
+
+endif # BR2_PACKAGE_OPTEE_TEST
package/optee-test/optee-test.mk +21 -3
index 69e84fdbd2..9bc074b215 100644
@@ -4,10 +4,23 @@
 #
 ################################################################################
 
-OPTEE_TEST_VERSION = 4.2.0
-OPTEE_TEST_SITE = $(call github,OP-TEE,optee_test,$(OPTEE_TEST_VERSION))
+OPTEE_TEST_VERSION = $(call qstrip,$(BR2_PACKAGE_OPTEE_TEST_VERSION))
 OPTEE_TEST_LICENSE = GPL-2.0, BSD-2-Clause,
+ifeq ($(BR2_PACKAGE_OPTEE_TEST_LATEST),y)
 OPTEE_TEST_LICENSE_FILES = LICENSE.md
+endif
+
+ifeq ($(BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL),y)
+OPTEE_TEST_TARBALL = $(call qstrip,$(BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL_LOCATION))
+OPTEE_TEST_SITE = $(patsubst %/,%,$(dir $(OPTEE_TEST_TARBALL)))
+OPTEE_TEST_SOURCE = $(notdir $(OPTEE_TEST_TARBALL))
+else
+OPTEE_TEST_SITE = $(call github,OP-TEE,optee_test,$(OPTEE_TEST_VERSION))
+endif
+
+ifeq ($(BR2_PACKAGE_OPTEE_TEST):$(BR2_PACKAGE_OPTEE_TEST_LATEST),y:)
+BR_NO_CHECK_HASH_FOR += $(OPTEE_TEST_SOURCE)
+endif
 
 OPTEE_TEST_DEPENDENCIES = optee-client optee-os
 
@@ -34,4 +47,10 @@ endef
 OPTEE_TEST_POST_BUILD_HOOKS += OPTEE_TEST_BUILD_TAS
 OPTEE_TEST_POST_INSTALL_TARGET_HOOKS += OPTEE_TEST_INSTALL_TAS
 
+ifeq ($(BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL)$(BR_BUILDING),yy)
+ifeq ($(call qstrip,$(BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL_LOCATION)),)
+$(error No tarball location specified. Please check BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL_LOCATION)
+endif
+endif
+
 $(eval $(cmake-package))
--
Quoted 3 lines

2.25.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#6 lore raw

PATCH 3/3 package/optee-examples: Add support for custom tarball

In reply to Kory Maincent via buildroot

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.

---
 package/optee-examples/Config.in         | 42 ++++++++++++++++++++++++
 package/optee-examples/optee-examples.mk | 26 +++++++++++++--
 2 files changed, 66 insertions(+), 2 deletions(-)
package/optee-examples/Config.in +42 -0
index eb6ee16502..83a1e9cb09 100644
@@ -26,3 +26,45 @@ comment "optee-examples needs a toolchain w/ threads, dynamic library, headers >
 	depends on BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \
 		!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.2.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.2.0"		if BR2_PACKAGE_OPTEE_EXAMPLES_LATEST
+	default "custom"	if BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_TARBALL
+
+endif # BR2_PACKAGE_OPTEE_EXAMPLES
package/optee-examples/optee-examples.mk +24 -2
index 7d52a277d2..2e20dc4dd4 100644
@@ -4,10 +4,26 @@
 #
 ################################################################################
 
-OPTEE_EXAMPLES_VERSION = 4.2.0
-OPTEE_EXAMPLES_SITE = $(call github,linaro-swg,optee_examples,$(OPTEE_EXAMPLES_VERSION))
+OPTEE_EXAMPLES_VERSION = $(call qstrip,$(BR2_PACKAGE_OPTEE_EXAMPLES_VERSION))
 OPTEE_EXAMPLES_LICENSE = BSD-2-Clause
+ifeq ($(BR2_PACKAGE_OPTEE_EXAMPLES_LATEST),y)
 OPTEE_EXAMPLES_LICENSE_FILES = LICENSE
+endif
+
+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 ifeq ($(BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_GIT),y)
+OPTEE_EXAMPLES_SITE = $(call qstrip,$(BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_REPO_URL))
+OPTEE_EXAMPLES_SITE_METHOD = git
+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
 
@@ -28,4 +44,10 @@ endef
 OPTEE_EXAMPLES_POST_BUILD_HOOKS += OPTEE_EXAMPLES_BUILD_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))
Signature · 6 lines
2.25.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Acked-by on v1 3/3
#7 lore raw

Re: [Buildroot] [PATCH 3/3] package/optee-examples: Add support for custom tarball

Quoted 11 lines · Kory Maincent

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.

---
 package/optee-examples/Config.in         | 42 ++++++++++++++++++++++++
 package/optee-examples/optee-examples.mk | 26 +++++++++++++--
 2 files changed, 66 insertions(+), 2 deletions(-)
Quoted 95 lines
package/optee-examples/Config.in +42 -0
index eb6ee16502..83a1e9cb09 100644
@@ -26,3 +26,45 @@ comment "optee-examples needs a toolchain w/ threads, dynamic library, headers >
        depends on BR2_USE_MMU
        depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \
                !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.2.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.2.0"         if BR2_PACKAGE_OPTEE_EXAMPLES_LATEST
+       default "custom"        if BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_TARBALL
+
+endif # BR2_PACKAGE_OPTEE_EXAMPLES
package/optee-examples/optee-examples.mk +24 -3
index 7d52a277d2..2e20dc4dd4 100644
@@ -4,10 +4,26 @@
 #
 ################################################################################
 
-OPTEE_EXAMPLES_VERSION = 4.2.0
-OPTEE_EXAMPLES_SITE = $(call github,linaro-swg,optee_examples,$(OPTEE_EXAMPLES_VERSION))
+OPTEE_EXAMPLES_VERSION = $(call qstrip,$(BR2_PACKAGE_OPTEE_EXAMPLES_VERSION))
 OPTEE_EXAMPLES_LICENSE = BSD-2-Clause
+ifeq ($(BR2_PACKAGE_OPTEE_EXAMPLES_LATEST),y)
 OPTEE_EXAMPLES_LICENSE_FILES = LICENSE
+endif
+
+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 ifeq ($(BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_GIT),y)
+OPTEE_EXAMPLES_SITE = $(call qstrip,$(BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_REPO_URL))
+OPTEE_EXAMPLES_SITE_METHOD = git
+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
 
@@ -28,4 +44,10 @@ endef
 OPTEE_EXAMPLES_POST_BUILD_HOOKS += OPTEE_EXAMPLES_BUILD_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))
--
Quoted 3 lines

2.25.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#8 lore raw
In reply to Kory Maincent via buildroot

Hello Kory,

Quoted 5 lines · Kory Maincent

OP-TEE OS supports custom tarballs, but the optee-client, optee-test, and optee-examples projects do not. This might cause version mismatches between OP-TEE OS and these related projects.

Quoted 7 lines

This patch series adds support for custom tarball URLs to address these potential issues.

Kory Maincent (3):
package/optee-client: Add support for custom tarball package/optee-test: Add support for custom tarball package/optee-examples: Add support for custom tarball

Acked-by Etienne Carriere <[email protected]> for the series.

Quoted 9 lines
 package/optee-client/Config.in           | 38 +++++++++++++++++++++
 package/optee-client/optee-client.mk     | 24 ++++++++++++--
 package/optee-examples/Config.in         | 42 ++++++++++++++++++++++++
 package/optee-examples/optee-examples.mk | 26 +++++++++++++--
 package/optee-test/Config.in             | 41 +++++++++++++++++++++++
 package/optee-test/optee-test.mk         | 23 +++++++++++--
 6 files changed, 188 insertions(+), 6 deletions(-)
Quoted 3 lines

--
2.25.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#9 lore raw

Hello Etienne,

Quoted 7 lines · On Mon, 24 Jun 2024 07:00:02 +0000 Etienne CARRIERE - foss…

Hello Kory,

On Mon, Thu, 20 Jun 2024 16:38:53 +0200, Kory Maincent wrote:
[...]

Acked-by Etienne Carriere <[email protected]> for the series.

I don't think patchwork manages the tags in the cover letter. Could you send your Acked-by on all patches, please? Or maybe I can send a v2 with your Acked-by.

Regards,

Signature · 7 lines
Köry Maincent, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot