boot/optee-os: support new optee-os 3.16.0 build dependencies
v2 cover boot/optee-os: support new optee-os 3.16.0 build dependencies
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 neess to be aligned with optee-os version.
----
Changes in v2:
- Bump optee-client, optee-benchmark, optee-examples and optee-test
Clément Léger (4):
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
Etienne Carriere (3):
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 | 13 +++++++++++-- boot/optee-os/optee-os.hash | 2 +- boot/optee-os/optee-os.mk | 7 ++++++- 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 +- package/python-cryptography/python-cryptography.mk | 7 +++++++ 12 files changed, 37 insertions(+), 16 deletions(-)
Signature · 6 lines
2.34.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 1/7 package/python-cryptography: enable host package
Enable host package and add needed dependencies.
--- package/python-cryptography/python-cryptography.mk | 7 +++++++ 1 file changed, 7 insertions(+)
package/python-cryptography/python-cryptography.mk +7 -0
@@ -17,6 +17,11 @@ PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ host-python-cffi \ host-rustc \ openssl +HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ + host-python-setuptools-rust \ + host-python-cffi \ + host-rustc \ + openssl PYTHON_CRYPTOGRAPHY_ENV = \ $(PKG_CARGO_ENV) \ PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)"
@@ -27,4 +32,6 @@ PYTHON_CRYPTOGRAPHY_DL_ENV = \ $(PKG_CARGO_ENV) \ BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml + $(eval $(python-package)) +$(eval $(host-python-package))
Signature · 6 lines
2.34.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 2/7 boot/optee-os: add support to build with python-cryptography
In reply to Clément Léger via buildrootNewer 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.
--- boot/optee-os/Config.in | 8 ++++++++ boot/optee-os/optee-os.mk | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-)
boot/optee-os/Config.in +8 -0
@@ -48,6 +48,14 @@ config BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION endif +config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY + bool "optee-os needs host-python-cryptography to build" + help + OP-TEE 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
boot/optee-os/optee-os.mk +6 -1
@@ -21,7 +21,12 @@ 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 # On 64bit targets, OP-TEE OS can be built in 32bit mode, or # can be built in 64bit mode and support 32bit and 64bit
Signature · 6 lines
2.34.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 3/7 boot/optee-os: bump to version 3.16.0
In reply to Clément Léger via buildrootBump 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.
--- boot/optee-os/Config.in | 5 +++-- boot/optee-os/optee-os.hash | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)
boot/optee-os/Config.in +3 -2
@@ -18,7 +18,7 @@ choice Select the version of OP-TEE OS you want to use config BR2_TARGET_OPTEE_OS_LATEST - bool "3.15.0" + bool "3.16.0" help Use the latest release tag from the OP-TEE OS official Git repository.
@@ -50,6 +50,7 @@ endif config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY bool "optee-os needs host-python-cryptography to build" + default y help OP-TEE version below 3.16 used python-pycryptodomex package in python scripts. Newer version uses python-cryptography.
@@ -58,7 +59,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
boot/optee-os/optee-os.hash +1 -1
@@ -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 +sha256 ebc8e18ad2039ee97c34f74a7546de9119e26f04c368b6c7fd0c55f93d33d2d6 optee-os-3.16.0.tar.gz # Locally computed sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE
Signature · 6 lines
2.34.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 4/7 package/optee-test: bump to version 3.16.0
In reply to Clément Léger via buildrootBump OP-TEE test package version to OP-TEE release 3.16.0.
--- package/optee-test/optee-test.hash | 4 ++-- package/optee-test/optee-test.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
package/optee-test/optee-test.hash +2 -2
@@ -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
package/optee-test/optee-test.mk +1 -1
@@ -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
Signature · 6 lines
2.34.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 5/7 package/optee-examples: bump to version 3.16.0
In reply to Clément Léger via buildrootFrom: Etienne Carriere <[email protected]>
Bump OP-TEE Examples package version to OP-TEE release 3.16.0.
--- package/optee-examples/optee-examples.hash | 4 ++-- package/optee-examples/optee-examples.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
package/optee-examples/optee-examples.hash +2 -2
@@ -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
package/optee-examples/optee-examples.mk +1 -1
@@ -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
Signature · 6 lines
2.34.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 6/7 package/optee-client: bump to version 3.16.0
In reply to Clément Léger via buildrootFrom: Etienne Carriere <[email protected]>
Bump OP-TEE Client package version to OP-TEE release 3.16.0.
--- package/optee-client/optee-client.hash | 4 ++-- package/optee-client/optee-client.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
package/optee-client/optee-client.hash +2 -2
@@ -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
package/optee-client/optee-client.mk +1 -1
@@ -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
Signature · 6 lines
2.34.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 7/7 package/optee-benchmark: bump to version 3.16.0
In reply to Clément Léger via buildrootFrom: Etienne Carriere <[email protected]>
Bump OP-TEE Benchmark package version to OP-TEE release 3.16.0.
--- package/optee-benchmark/optee-benchmark.hash | 4 ++-- package/optee-benchmark/optee-benchmark.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
package/optee-benchmark/optee-benchmark.hash +2 -2
@@ -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
package/optee-benchmark/optee-benchmark.mk +1 -1
@@ -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
Signature · 6 lines
2.34.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 22 lines · Clément Léger
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 neess to be aligned with optee-os version.
----
Changes in v2:
- Bump optee-client, optee-benchmark, optee-examples and optee-testClément Léger (4):
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.0Etienne Carriere (3):
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
Quoted 14 lines
boot/optee-os/Config.in | 13 +++++++++++-- boot/optee-os/optee-os.hash | 2 +- boot/optee-os/optee-os.mk | 7 ++++++- 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 +- package/python-cryptography/python-cryptography.mk | 7 +++++++ 12 files changed, 37 insertions(+), 16 deletions(-)
Sadly, I used commits from Etienne Carriere as initial commits messages (using -c). I did not noticed it reused the original commit author. I will resend a V3 with authorship fixed properly. Sorry for the inconvenience.
Signature · 7 lines
Clément Léger, Embedded Linux and Kernel engineer at Bootlin https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Etienne Carriere
Acked-byHello Clement,
Quoted 41 lines · Clément Léger
Quoted 22 lines · Clément Léger
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 neess to be aligned with optee-os version.
----
Changes in v2:
- Bump optee-client, optee-benchmark, optee-examples and optee-testClément Léger (4):
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.0Etienne Carriere (3):
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.0Quoted 14 lines
boot/optee-os/Config.in | 13 +++++++++++-- boot/optee-os/optee-os.hash | 2 +- boot/optee-os/optee-os.mk | 7 ++++++- 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 +- package/python-cryptography/python-cryptography.mk | 7 +++++++ 12 files changed, 37 insertions(+), 16 deletions(-)
Quoted 5 lines
Sadly, I used commits from Etienne Carriere as initial commits messages (using -c). I did not noticed it reused the original commit author. I will resend a V3 with authorship fixed properly. Sorry for the inconvenience.
series with only a comment on patch 3/7. You forgot to update the url in the inline comment of optee-os.hash for that package only.
Regards,
etienne
Quoted 4 lines
--
Clément Léger,
Embedded Linux and Kernel engineer at Bootlin
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot