* [Buildroot] [PATCH 0/3] Support custom tarball for OP-TEE related projects
@ 2024-06-20 14:38 Kory Maincent via buildroot
2024-06-20 14:38 ` [Buildroot] [PATCH 1/3] package/optee-client: Add support for custom tarball Kory Maincent via buildroot
` (3 more replies)
0 siblings, 4 replies; 10+ messages in thread
From: Kory Maincent via buildroot @ 2024-06-20 14:38 UTC (permalink / raw)
To: buildroot; +Cc: Kory Maincent, Etienne Carriere, thomas.petazzoni
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(-)
--
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 1/3] package/optee-client: Add support for custom tarball
2024-06-20 14:38 [Buildroot] [PATCH 0/3] Support custom tarball for OP-TEE related projects Kory Maincent via buildroot
@ 2024-06-20 14:38 ` Kory Maincent via buildroot
2024-07-04 14:50 ` Etienne CARRIERE - foss
2024-08-02 20:06 ` Thomas Petazzoni via buildroot
2024-06-20 14:38 ` [Buildroot] [PATCH 2/3] package/optee-test: " Kory Maincent via buildroot
` (2 subsequent siblings)
3 siblings, 2 replies; 10+ messages in thread
From: Kory Maincent via buildroot @ 2024-06-20 14:38 UTC (permalink / raw)
To: buildroot; +Cc: Kory Maincent, Etienne Carriere, thomas.petazzoni
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.
Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
---
package/optee-client/Config.in | 38 ++++++++++++++++++++++++++++
package/optee-client/optee-client.mk | 24 ++++++++++++++++--
2 files changed, 60 insertions(+), 2 deletions(-)
diff --git a/package/optee-client/Config.in b/package/optee-client/Config.in
index 4061164cbb..3a59ce9725 100644
--- a/package/optee-client/Config.in
+++ b/package/optee-client/Config.in
@@ -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"
diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk
index 6600a9c4fc..a91548a43b 100644
--- a/package/optee-client/optee-client.mk
+++ b/package/optee-client/optee-client.mk
@@ -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))
--
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 2/3] package/optee-test: Add support for custom tarball
2024-06-20 14:38 [Buildroot] [PATCH 0/3] Support custom tarball for OP-TEE related projects Kory Maincent via buildroot
2024-06-20 14:38 ` [Buildroot] [PATCH 1/3] package/optee-client: Add support for custom tarball Kory Maincent via buildroot
@ 2024-06-20 14:38 ` Kory Maincent via buildroot
2024-07-04 14:50 ` Etienne CARRIERE - foss
2024-06-20 14:38 ` [Buildroot] [PATCH 3/3] package/optee-examples: " Kory Maincent via buildroot
2024-06-24 7:00 ` [Buildroot] [PATCH 0/3] Support custom tarball for OP-TEE related projects Etienne CARRIERE - foss
3 siblings, 1 reply; 10+ messages in thread
From: Kory Maincent via buildroot @ 2024-06-20 14:38 UTC (permalink / raw)
To: buildroot; +Cc: Kory Maincent, Etienne Carriere, thomas.petazzoni
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.
Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
---
package/optee-test/Config.in | 41 ++++++++++++++++++++++++++++++++
package/optee-test/optee-test.mk | 23 ++++++++++++++++--
2 files changed, 62 insertions(+), 2 deletions(-)
diff --git a/package/optee-test/Config.in b/package/optee-test/Config.in
index 57a7834c75..1c4dbf7fb4 100644
--- a/package/optee-test/Config.in
+++ b/package/optee-test/Config.in
@@ -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
diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk
index 69e84fdbd2..9bc074b215 100644
--- a/package/optee-test/optee-test.mk
+++ b/package/optee-test/optee-test.mk
@@ -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))
--
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 3/3] package/optee-examples: Add support for custom tarball
2024-06-20 14:38 [Buildroot] [PATCH 0/3] Support custom tarball for OP-TEE related projects Kory Maincent via buildroot
2024-06-20 14:38 ` [Buildroot] [PATCH 1/3] package/optee-client: Add support for custom tarball Kory Maincent via buildroot
2024-06-20 14:38 ` [Buildroot] [PATCH 2/3] package/optee-test: " Kory Maincent via buildroot
@ 2024-06-20 14:38 ` Kory Maincent via buildroot
2024-07-04 14:50 ` Etienne CARRIERE - foss
2024-06-24 7:00 ` [Buildroot] [PATCH 0/3] Support custom tarball for OP-TEE related projects Etienne CARRIERE - foss
3 siblings, 1 reply; 10+ messages in thread
From: Kory Maincent via buildroot @ 2024-06-20 14:38 UTC (permalink / raw)
To: buildroot; +Cc: Kory Maincent, Etienne Carriere, thomas.petazzoni
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>
---
package/optee-examples/Config.in | 42 ++++++++++++++++++++++++
package/optee-examples/optee-examples.mk | 26 +++++++++++++--
2 files changed, 66 insertions(+), 2 deletions(-)
diff --git a/package/optee-examples/Config.in b/package/optee-examples/Config.in
index eb6ee16502..83a1e9cb09 100644
--- a/package/optee-examples/Config.in
+++ b/package/optee-examples/Config.in
@@ -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
diff --git a/package/optee-examples/optee-examples.mk b/package/optee-examples/optee-examples.mk
index 7d52a277d2..2e20dc4dd4 100644
--- a/package/optee-examples/optee-examples.mk
+++ b/package/optee-examples/optee-examples.mk
@@ -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))
--
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [Buildroot] [PATCH 0/3] Support custom tarball for OP-TEE related projects
2024-06-20 14:38 [Buildroot] [PATCH 0/3] Support custom tarball for OP-TEE related projects Kory Maincent via buildroot
` (2 preceding siblings ...)
2024-06-20 14:38 ` [Buildroot] [PATCH 3/3] package/optee-examples: " Kory Maincent via buildroot
@ 2024-06-24 7:00 ` Etienne CARRIERE - foss
2024-06-28 13:55 ` Kory Maincent via buildroot
3 siblings, 1 reply; 10+ messages in thread
From: Etienne CARRIERE - foss @ 2024-06-24 7:00 UTC (permalink / raw)
To: Kory Maincent, buildroot@buildroot.org; +Cc: thomas.petazzoni@bootlin.com
Hello Kory,
On Mon, Thu, 20 Jun 2024 16:38:53 +0200, Kory Maincent wrote:
>
> 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
Acked-by Etienne Carriere <etienne.carriere@foss.st.com>
for the series.
>
> 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(-)
>
> --
> 2.25.1
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Buildroot] [PATCH 0/3] Support custom tarball for OP-TEE related projects
2024-06-24 7:00 ` [Buildroot] [PATCH 0/3] Support custom tarball for OP-TEE related projects Etienne CARRIERE - foss
@ 2024-06-28 13:55 ` Kory Maincent via buildroot
0 siblings, 0 replies; 10+ messages in thread
From: Kory Maincent via buildroot @ 2024-06-28 13:55 UTC (permalink / raw)
To: Etienne CARRIERE - foss
Cc: thomas.petazzoni@bootlin.com, buildroot@buildroot.org
Hello Etienne,
On Mon, 24 Jun 2024 07:00:02 +0000
Etienne CARRIERE - foss <etienne.carriere@foss.st.com> wrote:
> Hello Kory,
>
> On Mon, Thu, 20 Jun 2024 16:38:53 +0200, Kory Maincent wrote:
> [...]
>
> Acked-by Etienne Carriere <etienne.carriere@foss.st.com>
> 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,
--
Köry Maincent, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Buildroot] [PATCH 1/3] package/optee-client: Add support for custom tarball
2024-06-20 14:38 ` [Buildroot] [PATCH 1/3] package/optee-client: Add support for custom tarball Kory Maincent via buildroot
@ 2024-07-04 14:50 ` Etienne CARRIERE - foss
2024-08-02 20:06 ` Thomas Petazzoni via buildroot
1 sibling, 0 replies; 10+ messages in thread
From: Etienne CARRIERE - foss @ 2024-07-04 14:50 UTC (permalink / raw)
To: Kory Maincent, buildroot@buildroot.org; +Cc: thomas.petazzoni@bootlin.com
Hi Kory,
On Mon, Thursday, June 20, 2024, Kory Maincent wrote:
> 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.
>
> Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
> ---
> package/optee-client/Config.in | 38 ++++++++++++++++++++++++++++
> package/optee-client/optee-client.mk | 24 ++++++++++++++++--
> 2 files changed, 60 insertions(+), 2 deletions(-)
>
Acked-by: Etienne Carriere <etienne.carriere@foss.st.com>
> diff --git a/package/optee-client/Config.in b/package/optee-client/Config.in
> index 4061164cbb..3a59ce9725 100644
> --- a/package/optee-client/Config.in
> +++ b/package/optee-client/Config.in
> @@ -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"
> diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk
> index 6600a9c4fc..a91548a43b 100644
> --- a/package/optee-client/optee-client.mk
> +++ b/package/optee-client/optee-client.mk
> @@ -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))
> --
> 2.25.1
>
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Buildroot] [PATCH 2/3] package/optee-test: Add support for custom tarball
2024-06-20 14:38 ` [Buildroot] [PATCH 2/3] package/optee-test: " Kory Maincent via buildroot
@ 2024-07-04 14:50 ` Etienne CARRIERE - foss
0 siblings, 0 replies; 10+ messages in thread
From: Etienne CARRIERE - foss @ 2024-07-04 14:50 UTC (permalink / raw)
To: Kory Maincent, buildroot@buildroot.org; +Cc: thomas.petazzoni@bootlin.com
On Mon, Thursday, June 20, 2024, Kory Maincent wrote:
> 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.
>
> Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
> ---
> package/optee-test/Config.in | 41 ++++++++++++++++++++++++++++++++
> package/optee-test/optee-test.mk | 23 ++++++++++++++++--
> 2 files changed, 62 insertions(+), 2 deletions(-)
>
Acked-by: Etienne Carriere <etienne.carriere@foss.st.com>
> diff --git a/package/optee-test/Config.in b/package/optee-test/Config.in
> index 57a7834c75..1c4dbf7fb4 100644
> --- a/package/optee-test/Config.in
> +++ b/package/optee-test/Config.in
> @@ -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
> diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk
> index 69e84fdbd2..9bc074b215 100644
> --- a/package/optee-test/optee-test.mk
> +++ b/package/optee-test/optee-test.mk
> @@ -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))
> --
> 2.25.1
>
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Buildroot] [PATCH 3/3] package/optee-examples: Add support for custom tarball
2024-06-20 14:38 ` [Buildroot] [PATCH 3/3] package/optee-examples: " Kory Maincent via buildroot
@ 2024-07-04 14:50 ` Etienne CARRIERE - foss
0 siblings, 0 replies; 10+ messages in thread
From: Etienne CARRIERE - foss @ 2024-07-04 14:50 UTC (permalink / raw)
To: Kory Maincent, buildroot@buildroot.org; +Cc: thomas.petazzoni@bootlin.com
On Mon, Thursday, June 20, 2024, Kory Maincent wrote:
> 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>
> ---
> package/optee-examples/Config.in | 42 ++++++++++++++++++++++++
> package/optee-examples/optee-examples.mk | 26 +++++++++++++--
> 2 files changed, 66 insertions(+), 2 deletions(-)
>
Acked-by: Etienne Carriere <etienne.carriere@foss.st.com>
> diff --git a/package/optee-examples/Config.in b/package/optee-examples/Config.in
> index eb6ee16502..83a1e9cb09 100644
> --- a/package/optee-examples/Config.in
> +++ b/package/optee-examples/Config.in
> @@ -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
> diff --git a/package/optee-examples/optee-examples.mk b/package/optee-examples/optee-examples.mk
> index 7d52a277d2..2e20dc4dd4 100644
> --- a/package/optee-examples/optee-examples.mk
> +++ b/package/optee-examples/optee-examples.mk
> @@ -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))
> --
> 2.25.1
>
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Buildroot] [PATCH 1/3] package/optee-client: Add support for custom tarball
2024-06-20 14:38 ` [Buildroot] [PATCH 1/3] package/optee-client: Add support for custom tarball Kory Maincent via buildroot
2024-07-04 14:50 ` Etienne CARRIERE - foss
@ 2024-08-02 20:06 ` Thomas Petazzoni via buildroot
1 sibling, 0 replies; 10+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-08-02 20:06 UTC (permalink / raw)
To: Kory Maincent via buildroot; +Cc: Kory Maincent, Etienne Carriere
On Thu, 20 Jun 2024 16:38:51 +0200
Kory Maincent via buildroot <buildroot@buildroot.org> wrote:
> 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.
>
> Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
> ---
> 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
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2024-08-02 20:07 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-20 14:38 [Buildroot] [PATCH 0/3] Support custom tarball for OP-TEE related projects Kory Maincent via buildroot
2024-06-20 14:38 ` [Buildroot] [PATCH 1/3] package/optee-client: Add support for custom tarball Kory Maincent via buildroot
2024-07-04 14:50 ` Etienne CARRIERE - foss
2024-08-02 20:06 ` Thomas Petazzoni via buildroot
2024-06-20 14:38 ` [Buildroot] [PATCH 2/3] package/optee-test: " Kory Maincent via buildroot
2024-07-04 14:50 ` Etienne CARRIERE - foss
2024-06-20 14:38 ` [Buildroot] [PATCH 3/3] package/optee-examples: " Kory Maincent via buildroot
2024-07-04 14:50 ` Etienne CARRIERE - foss
2024-06-24 7:00 ` [Buildroot] [PATCH 0/3] Support custom tarball for OP-TEE related projects Etienne CARRIERE - foss
2024-06-28 13:55 ` Kory Maincent via buildroot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox