[Buildroot] [PATCH v4 0/8] boot/optee-os: support new optee-os 3.16.0 build dependencies

[Buildroot] [PATCH v4 0/8] boot/optee-os: support new optee-os 3.16.0 build dependencies

[Clément Léger via buildroot]

Newer versions of optee-os (>= 3.16.0) uses python-cryptography instead
of python-pycryptodomex to build. This series adds support to build
host-python-cryptography and uses it in optee-os package to build the
3.16.0 version. Also bump optee-client, optee-benchmark, optee-examples
and optee-test which needs to be aligned with optee-os version.

----
Changes in v4:
- Add missing variables for python host package
- Found a missing DTC dependency while testing build in docker container
- Fix BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY title
- Change the logic to select BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY
- optee-os now depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS

Changes in v3:
- Fix authorship for commits that were copied from Etienne ones.
- Fix package URL for optee-os
- Added Acked-by Etienne Carriere

Changes in v2:
- Bump optee-client, optee-benchmark, optee-examples and optee-test

Clément Léger (8):
  boot/optee-os: add option to select DTC dependency
  package/python-cryptography: enable host package
  boot/optee-os: add support to build with python-cryptography
  boot/optee-os: bump to version 3.16.0
  package/optee-test: bump to version 3.16.0
  package/optee-examples: bump to version 3.16.0
  package/optee-client: bump to version 3.16.0
  package/optee-benchmark: bump to version 3.16.0

 boot/optee-os/Config.in                       | 21 +++++++++++++++++--
 boot/optee-os/optee-os.hash                   |  4 ++--
 boot/optee-os/optee-os.mk                     | 12 ++++++++++-
 package/optee-benchmark/optee-benchmark.hash  |  4 ++--
 package/optee-benchmark/optee-benchmark.mk    |  2 +-
 package/optee-client/optee-client.hash        |  4 ++--
 package/optee-client/optee-client.mk          |  2 +-
 package/optee-examples/optee-examples.hash    |  4 ++--
 package/optee-examples/optee-examples.mk      |  2 +-
 package/optee-test/optee-test.hash            |  4 ++--
 package/optee-test/optee-test.mk              |  2 +-
 .../python-cryptography.mk                    | 14 +++++++++++++
 12 files changed, 58 insertions(+), 17 deletions(-)

-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v4 1/8] boot/optee-os: add option to select DTC dependency

[Clément Léger via buildroot]

Some platforms (stm32, sam) needs DTC to build the platform
device-trees. Add BR2_TARGET_OPTEE_OS_NEEDS_DTC configuration
option to select host-dtc package when building.

Signed-off-by: Clément Léger <clement.leger@bootlin.com>
---
 boot/optee-os/Config.in   | 7 +++++++
 boot/optee-os/optee-os.mk | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in
index 0974578484..2f6143f1f4 100644
--- a/boot/optee-os/Config.in
+++ b/boot/optee-os/Config.in
@@ -48,6 +48,13 @@ config BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION
 
 endif
 
+config BR2_TARGET_OPTEE_OS_NEEDS_DTC
+	bool "OP-TEE OS needs dtc"
+	select BR2_PACKAGE_HOST_DTC
+	help
+	  Select this option if your OP-TEE OS platform configuration
+	  requires the Device Tree compiler to be available.
+
 config BR2_TARGET_OPTEE_OS_VERSION
 	string
 	default "3.15.0"	if BR2_TARGET_OPTEE_OS_LATEST
diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk
index 166b5e693c..9f76d8450e 100644
--- a/boot/optee-os/optee-os.mk
+++ b/boot/optee-os/optee-os.mk
@@ -23,6 +23,10 @@ endif
 
 OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools
 
+ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_DTC),y)
+OPTEE_OS_DEPENDENCIES += host-dtc
+endif
+
 # On 64bit targets, OP-TEE OS can be built in 32bit mode, or
 # can be built in 64bit mode and support 32bit and 64bit
 # trusted applications. Since buildroot currently references
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v4 2/8] package/python-cryptography: enable host package

[Clément Léger via buildroot]

Enable host package and add needed dependencies.

Acked-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Clément Léger <clement.leger@bootlin.com>
---
 package/python-cryptography/python-cryptography.mk | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk
index a524f729c8..8a4ffe6d75 100644
--- a/package/python-cryptography/python-cryptography.mk
+++ b/package/python-cryptography/python-cryptography.mk
@@ -17,14 +17,28 @@ PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \
 	host-python-cffi \
 	host-rustc \
 	openssl
+HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \
+	host-python-setuptools-rust \
+	host-python-cffi \
+	host-rustc \
+	host-openssl
 PYTHON_CRYPTOGRAPHY_ENV = \
 	$(PKG_CARGO_ENV) \
 	PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)"
+HOST_PYTHON_CRYPTOGRAPHY_ENV = \
+	$(HOST_PKG_CARGO_ENV) \
+	PYO3_CROSS_LIB_DIR="$(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)"
 # We need to vendor the Cargo crates at download time
 PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo
+HOST_PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo
 PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc
+HOST_PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc
 PYTHON_CRYPTOGRAPHY_DL_ENV = \
 	$(PKG_CARGO_ENV) \
 	BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml
+HOST_PYTHON_CRYPTOGRAPHY_DL_ENV = \
+	$(HOST_PKG_CARGO_ENV) \
+	BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml
 
 $(eval $(python-package))
+$(eval $(host-python-package))
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v4 3/8] boot/optee-os: add support to build with python-cryptography

[Clément Léger via buildroot]

Newer version of optee-os (>= 3.16) uses python-cryptography instead of
python-pycryptodomex in python scripts. Add support to build these
newer versions by adding a new
BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY option which will
select host-python-cryptography dependency when building optee-os.

Acked-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Clément Léger <clement.leger@bootlin.com>
---
 boot/optee-os/Config.in   | 9 +++++++++
 boot/optee-os/optee-os.mk | 8 +++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in
index 2f6143f1f4..3996039191 100644
--- a/boot/optee-os/Config.in
+++ b/boot/optee-os/Config.in
@@ -1,6 +1,7 @@
 config BR2_TARGET_OPTEE_OS
 	bool "optee_os"
 	depends on BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A
+	depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
 	help
 	  OP-TEE OS provides the secure world boot image and the trust
 	  application development kit of the OP-TEE project. OP-TEE OS
@@ -55,6 +56,14 @@ config BR2_TARGET_OPTEE_OS_NEEDS_DTC
 	  Select this option if your OP-TEE OS platform configuration
 	  requires the Device Tree compiler to be available.
 
+config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY
+	bool "OP-TEE OS needs host-python-cryptography"
+	help
+	  OP-TEE OS version below 3.16 used python-pycryptodomex
+	  package in python scripts. Newer version uses
+	  python-cryptography. Select this option if optee-os needs
+	  python-cryptography to be built.
+
 config BR2_TARGET_OPTEE_OS_VERSION
 	string
 	default "3.15.0"	if BR2_TARGET_OPTEE_OS_LATEST
diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk
index 9f76d8450e..5313a1badc 100644
--- a/boot/optee-os/optee-os.mk
+++ b/boot/optee-os/optee-os.mk
@@ -21,7 +21,13 @@ else
 OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION))
 endif
 
-OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools
+OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pyelftools
+
+ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY),y)
+OPTEE_OS_DEPENDENCIES += host-python-cryptography
+else
+OPTEE_OS_DEPENDENCIES += host-python-pycryptodomex
+endif
 
 ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_DTC),y)
 OPTEE_OS_DEPENDENCIES += host-dtc
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v4 4/8] boot/optee-os: bump to version 3.16.0

[Clément Léger via buildroot]

Bump OP-TEE OS package version to OP-TEE release 3.16.0 and set
BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY default to 'y' since
python-cryptography is now needed to build optee-os.

Acked-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Clément Léger <clement.leger@bootlin.com>
---
 boot/optee-os/Config.in     | 5 +++--
 boot/optee-os/optee-os.hash | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in
index 3996039191..29924d9198 100644
--- a/boot/optee-os/Config.in
+++ b/boot/optee-os/Config.in
@@ -19,7 +19,8 @@ choice
 	  Select the version of OP-TEE OS you want to use
 
 config BR2_TARGET_OPTEE_OS_LATEST
-	bool "3.15.0"
+	select BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY
+	bool "3.16.0"
 	help
 	  Use the latest release tag from the OP-TEE OS official Git
 	  repository.
@@ -66,7 +67,7 @@ config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY
 
 config BR2_TARGET_OPTEE_OS_VERSION
 	string
-	default "3.15.0"	if BR2_TARGET_OPTEE_OS_LATEST
+	default "3.16.0"	if BR2_TARGET_OPTEE_OS_LATEST
 	default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \
 				if BR2_TARGET_OPTEE_OS_CUSTOM_GIT
 
diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash
index 3c32e25b36..b9b0e5b43f 100644
--- a/boot/optee-os/optee-os.hash
+++ b/boot/optee-os/optee-os.hash
@@ -1,4 +1,4 @@
-# From https://github.com/OP-TEE/optee_os/archive/3.15.0/optee-os-3.15.0.tar.gz
-sha256 e5bb3d9eedaf7785af091602addac5b52118f4cdc108af9cd6f6c96b21503ab8  optee-os-3.15.0.tar.gz
+# From https://github.com/OP-TEE/optee_os/archive/3.16.0/optee-os-3.16.0.tar.gz
+sha256 ebc8e18ad2039ee97c34f74a7546de9119e26f04c368b6c7fd0c55f93d33d2d6  optee-os-3.16.0.tar.gz
 # Locally computed
 sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a  LICENSE
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v4 5/8] package/optee-test: bump to version 3.16.0

[Clément Léger via buildroot]

Bump OP-TEE test package version to OP-TEE release 3.16.0.

Acked-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Clément Léger <clement.leger@bootlin.com>
---
 package/optee-test/optee-test.hash | 4 ++--
 package/optee-test/optee-test.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/optee-test/optee-test.hash b/package/optee-test/optee-test.hash
index 5d68f94fbd..7806d9a1af 100644
--- a/package/optee-test/optee-test.hash
+++ b/package/optee-test/optee-test.hash
@@ -1,4 +1,4 @@
-# From https://github.com/OP-TEE/optee_test/archive/3.15.0/optee-test-3.15.0.tar.gz
-sha256 9c2b6b80055cbef0f9bccce17dde494725bc71d9013dacaeb3e46d0926191098  optee-test-3.15.0.tar.gz
+# From https://github.com/OP-TEE/optee_test/archive/3.16.0/optee-test-3.16.0.tar.gz
+sha256 b24a3871605a341fa87e6d4e111f97001f11a72c025e75d6739ed78841b6acba  optee-test-3.16.0.tar.gz
 # Locally computed
 sha256 6e6810981f0ddab9e0d44399d0700a15d9f760a3c2843cc866659c2074139ae7  LICENSE.md
diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk
index f2117c0d00..7b27558b36 100644
--- a/package/optee-test/optee-test.mk
+++ b/package/optee-test/optee-test.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPTEE_TEST_VERSION = 3.15.0
+OPTEE_TEST_VERSION = 3.16.0
 OPTEE_TEST_SITE = $(call github,OP-TEE,optee_test,$(OPTEE_TEST_VERSION))
 OPTEE_TEST_LICENSE = GPL-2.0, BSD-2-Clause,
 OPTEE_TEST_LICENSE_FILES = LICENSE.md
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v4 6/8] package/optee-examples: bump to version 3.16.0

[Clément Léger via buildroot]

Bump OP-TEE Examples package version to OP-TEE release 3.16.0.

Acked-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Clément Léger <clement.leger@bootlin.com>
---
 package/optee-examples/optee-examples.hash | 4 ++--
 package/optee-examples/optee-examples.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/optee-examples/optee-examples.hash b/package/optee-examples/optee-examples.hash
index f88904c795..afd50afea0 100644
--- a/package/optee-examples/optee-examples.hash
+++ b/package/optee-examples/optee-examples.hash
@@ -1,4 +1,4 @@
-# From https://github.com/linaro-swg/optee_examples/archive/3.15.0/optee-examples-3.15.0.tar.gz
-sha256 9770827292eea85068913077d3406070f6182389779c5d4a5c0876bffd962353  optee-examples-3.15.0.tar.gz
+# From https://github.com/linaro-swg/optee_examples/archive/3.16.0/optee-examples-3.16.0.tar.gz
+sha256 45e06dc5520f3097cc124434acafc26b8db28db87df62f3ad2ddff06cacce969  optee-examples-3.16.0.tar.gz
 # Locally computed
 sha256 6f1ef8449cb82ae79d2155605f7985bdf0f08e7ab5007de9b4362e8bf28733b9  LICENSE
diff --git a/package/optee-examples/optee-examples.mk b/package/optee-examples/optee-examples.mk
index 2b46dcc1eb..31e5f260df 100644
--- a/package/optee-examples/optee-examples.mk
+++ b/package/optee-examples/optee-examples.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPTEE_EXAMPLES_VERSION = 3.15.0
+OPTEE_EXAMPLES_VERSION = 3.16.0
 OPTEE_EXAMPLES_SITE = $(call github,linaro-swg,optee_examples,$(OPTEE_EXAMPLES_VERSION))
 OPTEE_EXAMPLES_LICENSE = BSD-2-Clause
 OPTEE_EXAMPLES_LICENSE_FILES = LICENSE
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v4 7/8] package/optee-client: bump to version 3.16.0

[Clément Léger via buildroot]

Bump OP-TEE Client package version to OP-TEE release 3.16.0.

Acked-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Clément Léger <clement.leger@bootlin.com>
---
 package/optee-client/optee-client.hash | 4 ++--
 package/optee-client/optee-client.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/optee-client/optee-client.hash b/package/optee-client/optee-client.hash
index 3ae06f2afb..26b0a6ced4 100644
--- a/package/optee-client/optee-client.hash
+++ b/package/optee-client/optee-client.hash
@@ -1,4 +1,4 @@
-# From https://github.com/OP-TEE/optee_client/archive/3.15.0/optee-client-3.15.0.tar.gz
-sha256 e1ea6c953e3584248d7a62050813e5ac0f0112933447954c44236a233a4cbba5  optee-client-3.15.0.tar.gz
+# From https://github.com/OP-TEE/optee_client/archive/3.16.0/optee-client-3.16.0.tar.gz
+sha256 cba92bedc9f8c39c19e50a22259066eaad5ceb248308edee27e221f11f5d8064  optee-client-3.16.0.tar.gz
 # Locally computed
 sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f  LICENSE
diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk
index dda9a2855d..2cadc564f0 100644
--- a/package/optee-client/optee-client.mk
+++ b/package/optee-client/optee-client.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPTEE_CLIENT_VERSION = 3.15.0
+OPTEE_CLIENT_VERSION = 3.16.0
 OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION))
 OPTEE_CLIENT_LICENSE = BSD-2-Clause
 OPTEE_CLIENT_LICENSE_FILES = LICENSE
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v4 8/8] package/optee-benchmark: bump to version 3.16.0

[Clément Léger via buildroot]

Bump OP-TEE Benchmark package version to OP-TEE release 3.16.0.

Acked-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Clément Léger <clement.leger@bootlin.com>
---
 package/optee-benchmark/optee-benchmark.hash | 4 ++--
 package/optee-benchmark/optee-benchmark.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/optee-benchmark/optee-benchmark.hash b/package/optee-benchmark/optee-benchmark.hash
index 3797920c35..f36e074eec 100644
--- a/package/optee-benchmark/optee-benchmark.hash
+++ b/package/optee-benchmark/optee-benchmark.hash
@@ -1,4 +1,4 @@
-# From https://github.com/linaro-swg/optee_benchmark/archive/3.15.0/optee-benchmark-3.15.0.tar.gz
-sha256 f1ddac5e9f58333194eb302e6d9840fa334300bc103abb3d9f783bf009a78c50 optee-benchmark-3.15.0.tar.gz
+# From https://github.com/linaro-swg/optee_benchmark/archive/3.16.0/optee-benchmark-3.16.0.tar.gz
+sha256 55b24525f08ffda6799f90ab7bab2125f1c3f17d5cbd1b34480cd28b5f46fca9 optee-benchmark-3.16.0.tar.gz
 # Locally computed
 sha256 0571be5b739142dc3e40e0a4e7e30d4ab8bff0d4d606a3f2db2010745587d383  LICENSE
diff --git a/package/optee-benchmark/optee-benchmark.mk b/package/optee-benchmark/optee-benchmark.mk
index 1357f9f270..493f407a44 100644
--- a/package/optee-benchmark/optee-benchmark.mk
+++ b/package/optee-benchmark/optee-benchmark.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPTEE_BENCHMARK_VERSION = 3.15.0
+OPTEE_BENCHMARK_VERSION = 3.16.0
 OPTEE_BENCHMARK_SITE = $(call github,linaro-swg,optee_benchmark,$(OPTEE_BENCHMARK_VERSION))
 OPTEE_BENCHMARK_LICENSE = BSD-2-Clause
 OPTEE_BENCHMARK_LICENSE_FILES = LICENSE
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v4 3/8] boot/optee-os: add support to build with python-cryptography

[Etienne Carriere]

Hello Clément,

Once bumped to 3.16.0, optee-os won't revert to pycryptodomex.
Why not using a single change to upgrade optee_os to 3.16.0 and update
dependencies?
This would get rid of BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY.


Best regards,
Etienne

On Mon, 14 Mar 2022 at 16:33, Clément Léger <clement.leger@bootlin.com> wrote:
>
> Newer version of optee-os (>= 3.16) uses python-cryptography instead of
> python-pycryptodomex in python scripts. Add support to build these
> newer versions by adding a new
> BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY option which will
> select host-python-cryptography dependency when building optee-os.
>
> Acked-by: Etienne Carriere <etienne.carriere@linaro.org>
> Signed-off-by: Clément Léger <clement.leger@bootlin.com>
> ---
>  boot/optee-os/Config.in   | 9 +++++++++
>  boot/optee-os/optee-os.mk | 8 +++++++-
>  2 files changed, 16 insertions(+), 1 deletion(-)
>
> diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in
> index 2f6143f1f4..3996039191 100644
> --- a/boot/optee-os/Config.in
> +++ b/boot/optee-os/Config.in
> @@ -1,6 +1,7 @@
>  config BR2_TARGET_OPTEE_OS
>         bool "optee_os"
>         depends on BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A
> +       depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
>         help
>           OP-TEE OS provides the secure world boot image and the trust
>           application development kit of the OP-TEE project. OP-TEE OS
> @@ -55,6 +56,14 @@ config BR2_TARGET_OPTEE_OS_NEEDS_DTC
>           Select this option if your OP-TEE OS platform configuration
>           requires the Device Tree compiler to be available.
>
> +config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY
> +       bool "OP-TEE OS needs host-python-cryptography"
> +       help
> +         OP-TEE OS version below 3.16 used python-pycryptodomex
> +         package in python scripts. Newer version uses
> +         python-cryptography. Select this option if optee-os needs
> +         python-cryptography to be built.
> +
>  config BR2_TARGET_OPTEE_OS_VERSION
>         string
>         default "3.15.0"        if BR2_TARGET_OPTEE_OS_LATEST
> diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk
> index 9f76d8450e..5313a1badc 100644
> --- a/boot/optee-os/optee-os.mk
> +++ b/boot/optee-os/optee-os.mk
> @@ -21,7 +21,13 @@ else
>  OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION))
>  endif
>
> -OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools
> +OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pyelftools
> +
> +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY),y)
> +OPTEE_OS_DEPENDENCIES += host-python-cryptography
> +else
> +OPTEE_OS_DEPENDENCIES += host-python-pycryptodomex
> +endif
>
>  ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_DTC),y)
>  OPTEE_OS_DEPENDENCIES += host-dtc
> --
> 2.34.1
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v4 1/8] boot/optee-os: add option to select DTC dependency

[Etienne Carriere]

Hello Clément,

On Mon, 14 Mar 2022 at 16:32, Clément Léger <clement.leger@bootlin.com> wrote:
>
> Some platforms (stm32, sam) needs DTC to build the platform
> device-trees. Add BR2_TARGET_OPTEE_OS_NEEDS_DTC configuration
> option to select host-dtc package when building.
>
> Signed-off-by: Clément Léger <clement.leger@bootlin.com>
> ---
>  boot/optee-os/Config.in   | 7 +++++++
>  boot/optee-os/optee-os.mk | 4 ++++
>  2 files changed, 11 insertions(+)
>
> diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in
> index 0974578484..2f6143f1f4 100644
> --- a/boot/optee-os/Config.in
> +++ b/boot/optee-os/Config.in
> @@ -48,6 +48,13 @@ config BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION
>
>  endif
>
> +config BR2_TARGET_OPTEE_OS_NEEDS_DTC
> +       bool "OP-TEE OS needs dtc"
> +       select BR2_PACKAGE_HOST_DTC
> +       help
> +         Select this option if your OP-TEE OS platform configuration
> +         requires the Device Tree compiler to be available.
> +
>  config BR2_TARGET_OPTEE_OS_VERSION
>         string
>         default "3.15.0"        if BR2_TARGET_OPTEE_OS_LATEST
> diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk
> index 166b5e693c..9f76d8450e 100644
> --- a/boot/optee-os/optee-os.mk
> +++ b/boot/optee-os/optee-os.mk
> @@ -23,6 +23,10 @@ endif
>
>  OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools
>
> +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_DTC),y)
> +OPTEE_OS_DEPENDENCIES += host-dtc
> +endif
> +
>  # On 64bit targets, OP-TEE OS can be built in 32bit mode, or
>  # can be built in 64bit mode and support 32bit and 64bit
>  # trusted applications. Since buildroot currently references
> --
> 2.34.1
>

Acked-by: Etienne Carriere <etienne.carriere@linaro.org>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v4 3/8] boot/optee-os: add support to build with python-cryptography

[Thomas Petazzoni via buildroot]

Hello Etienne,

On Mon, 14 Mar 2022 18:20:47 +0100
Etienne Carriere <etienne.carriere@linaro.org> wrote:

> Once bumped to 3.16.0, optee-os won't revert to pycryptodomex.
> Why not using a single change to upgrade optee_os to 3.16.0 and update
> dependencies?
> This would get rid of BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY.

OP-TEE is one of those Buildroot packages for which we offer a version
selection (because it is heavily tied to the hardware, like a
bootloader or the Linux kernel). So you can't assume that everybody
will be building 3.16.x or newer. Some people will probably still be
using older versions for quite some time, which we still have to
support.

Best regards,

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v4 2/8] package/python-cryptography: enable host package

[Yann E. MORIN]

Clément, All,

On 2022-03-14 16:31 +0100, Clément Léger via buildroot spake thusly:
> Enable host package and add needed dependencies.
> 
> Acked-by: Etienne Carriere <etienne.carriere@linaro.org>
> Signed-off-by: Clément Léger <clement.leger@bootlin.com>
> ---
>  package/python-cryptography/python-cryptography.mk | 14 ++++++++++++++
>  1 file changed, 14 insertions(+)
> 
> diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk
> index a524f729c8..8a4ffe6d75 100644
> --- a/package/python-cryptography/python-cryptography.mk
> +++ b/package/python-cryptography/python-cryptography.mk
> @@ -17,14 +17,28 @@ PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \
>  	host-python-cffi \
>  	host-rustc \
>  	openssl
> +HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \
> +	host-python-setuptools-rust \
> +	host-python-cffi \
> +	host-rustc \
> +	host-openssl
>  PYTHON_CRYPTOGRAPHY_ENV = \
>  	$(PKG_CARGO_ENV) \
>  	PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)"
> +HOST_PYTHON_CRYPTOGRAPHY_ENV = \
> +	$(HOST_PKG_CARGO_ENV) \
> +	PYO3_CROSS_LIB_DIR="$(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)"
>  # We need to vendor the Cargo crates at download time
>  PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo
> +HOST_PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo

I think the host variant should automatically inherit that setting from
the target variant.

Afterall, it seems reasonable to expect that the download of the host
and target variants should usually be exactly the same.

>  PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc
> +HOST_PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc

Ditto for the download dependencies.

Although that may intoduce a circular dependency (i.e.: foo has host-foo
as a download dependency, so of course host-foo can't have host-foo as
download dependency...)

>  PYTHON_CRYPTOGRAPHY_DL_ENV = \
>  	$(PKG_CARGO_ENV) \
>  	BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml
> +HOST_PYTHON_CRYPTOGRAPHY_DL_ENV = \
> +	$(HOST_PKG_CARGO_ENV) \
> +	BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml

I am going to suggest that should also be the case for the _DL_ENV. Note
however that you would anyway need to override it for this package,
becasue thwe host and target variants have different go env.

So, something like (with _DL_SUBDIR thrown into the mix; of course, the
whole was thoroughly untested):

    package/pkg-generic: host variant inherits download settings

    Blablabla Afterall, it seems reasonable to expect that the download
    of the host and target variants should usually be exactly the same,
    but packages can still override that for the host vairant in special
    cases blablabla...

    Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>

    diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
    index b3a7e1d60e..79fcf603d3 100644
    --- a/package/pkg-generic.mk
    +++ b/package/pkg-generic.mk
    @@ -540,6 +540,30 @@ ifndef $(2)_SUBDIR
      endif
     endif
     
    +ifndef $(2)_DL_SUBDIR
    + ifdef $(3)_DL_SUBDIR
    +  $(2)_DL_SUBDIR = $$($(3)_DL_SUBDIR)
    + endif
    +endif
    +
    +ifndef $(2)_DOWNLOAD_DEPENDENCIES
    + ifdef $(3)_DOWNLOAD_DEPENDENCIES
    +  $(2)_DOWNLOAD_DEPENDENCIES = $$(filter-out $(1),$$($(3)_DOWNLOAD_DEPENDENCIES))
    + endif
    +endif
    +
    +ifndef $(2)_DL_ENV
    + ifdef $(3)_DL_ENV
    +  $(2)_DL_ENV = $$($(3)_DL_ENV)
    + endif
    +endif
    +
    +ifndef $(2)_DOWNLOAD_POST_PROCESS
    + ifdef $(3)_DOWNLOAD_POST_PROCESS
    +  $(2)_DOWNLOAD_POST_PROCESS = $$($(3)_DOWNLOAD_POST_PROCESS)
    + endif
    +endif
    +
     ifndef $(2)_STRIP_COMPONENTS
      ifdef $(3)_STRIP_COMPONENTS
       $(2)_STRIP_COMPONENTS = $$($(3)_STRIP_COMPONENTS)

Thoughts?

Regards,
Yann E. MORIN.

>  $(eval $(python-package))
> +$(eval $(host-python-package))
> -- 
> 2.34.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v4 1/8] boot/optee-os: add option to select DTC dependency

[Yann E. MORIN]

Clément, All,

On 2022-03-14 16:31 +0100, Clément Léger via buildroot spake thusly:
> Some platforms (stm32, sam) needs DTC to build the platform
> device-trees. Add BR2_TARGET_OPTEE_OS_NEEDS_DTC configuration
> option to select host-dtc package when building.
> 
> Signed-off-by: Clément Léger <clement.leger@bootlin.com>
> ---
>  boot/optee-os/Config.in   | 7 +++++++
>  boot/optee-os/optee-os.mk | 4 ++++
>  2 files changed, 11 insertions(+)
> 
> diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in
> index 0974578484..2f6143f1f4 100644
> --- a/boot/optee-os/Config.in
> +++ b/boot/optee-os/Config.in
> @@ -48,6 +48,13 @@ config BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION
>  
>  endif
>  
> +config BR2_TARGET_OPTEE_OS_NEEDS_DTC
> +	bool "OP-TEE OS needs dtc"
> +	select BR2_PACKAGE_HOST_DTC
> +	help
> +	  Select this option if your OP-TEE OS platform configuration
> +	  requires the Device Tree compiler to be available.

The following option, BR2_TARGET_OPTEE_OS_VERSION, is related to the
version selection, above, so adding this new option right in the middle
is not very great. I've moved that new option below.

Applied to master, thanks.

Regards,
Yann E. MORIN.

>  config BR2_TARGET_OPTEE_OS_VERSION
>  	string
>  	default "3.15.0"	if BR2_TARGET_OPTEE_OS_LATEST
> diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk
> index 166b5e693c..9f76d8450e 100644
> --- a/boot/optee-os/optee-os.mk
> +++ b/boot/optee-os/optee-os.mk
> @@ -23,6 +23,10 @@ endif
>  
>  OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools
>  
> +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_DTC),y)
> +OPTEE_OS_DEPENDENCIES += host-dtc
> +endif
> +
>  # On 64bit targets, OP-TEE OS can be built in 32bit mode, or
>  # can be built in 64bit mode and support 32bit and 64bit
>  # trusted applications. Since buildroot currently references
> -- 
> 2.34.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v4 2/8] package/python-cryptography: enable host package

[Thomas Petazzoni via buildroot]

On Mon, 14 Mar 2022 21:31:49 +0100
"Yann E. MORIN" <yann.morin.1998@free.fr> wrote:

> I think the host variant should automatically inherit that setting from
> the target variant.
> 
> Afterall, it seems reasonable to expect that the download of the host
> and target variants should usually be exactly the same.

I agree, but I thought this was really too much outside of what Clément
is trying to achieve in this patch series (I helped Clément internally
by reviewing/discussing this patch series, and indeed identified the
fact that those variables should be inherited between target/host).

But of course if as a maintainer you think this is something that is
really needed as a pre-requisite to merge those patches, we can ask
Clément to work on this :-)

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v4 2/8] package/python-cryptography: enable host package

[Yann E. MORIN]

Thomas, Clément, All,

On 2022-03-15 09:10 +0100, Thomas Petazzoni spake thusly:
> On Mon, 14 Mar 2022 21:31:49 +0100
> "Yann E. MORIN" <yann.morin.1998@free.fr> wrote:
> 
> > I think the host variant should automatically inherit that setting from
> > the target variant.
> > 
> > Afterall, it seems reasonable to expect that the download of the host
> > and target variants should usually be exactly the same.
> 
> I agree, but I thought this was really too much outside of what Clément
> is trying to achieve in this patch series (I helped Clément internally
> by reviewing/discussing this patch series, and indeed identified the
> fact that those variables should be inherited between target/host).
> 
> But of course if as a maintainer you think this is something that is
> really needed as a pre-requisite to merge those patches, we can ask
> Clément to work on this :-)

I think I even provided the patch in my review... ;-)

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v4 1/8] boot/optee-os: add option to select DTC dependency

[Peter Korsgaard]

>>>>> "Clément" == Clément Léger via buildroot <buildroot@buildroot.org> writes:

 > Some platforms (stm32, sam) needs DTC to build the platform
 > device-trees. Add BR2_TARGET_OPTEE_OS_NEEDS_DTC configuration
 > option to select host-dtc package when building.

 > Signed-off-by: Clément Léger <clement.leger@bootlin.com>

Committed to 2022.02.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot