* [Buildroot] [PATCH v5 0/8] boot/optee-os: support new optee-os 3.16.0 build dependencies
@ 2022-03-18 13:24 Clément Léger via buildroot
2022-03-18 13:24 ` [Buildroot] [PATCH v5 1/8] package/pkg-generic: host variant inherits target download settings Clément Léger via buildroot
` (8 more replies)
0 siblings, 9 replies; 17+ messages in thread
From: Clément Léger via buildroot @ 2022-03-18 13:24 UTC (permalink / raw)
To: buildroot
Cc: Etienne Carriere, Clément Léger, Yann E . MORIN,
Thomas Petazzoni
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 v5:
- Add Yann patch for host variable inheritance
- Move BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY option
- Remove host inherited variables from python-cryptography package
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 (7):
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
Yann E. MORIN (1):
package/pkg-generic: host variant inherits target download settings
boot/optee-os/Config.in | 14 +++++++++--
boot/optee-os/optee-os.hash | 4 ++--
boot/optee-os/optee-os.mk | 8 ++++++-
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/pkg-generic.mk | 24 +++++++++++++++++++
.../python-cryptography.mk | 12 ++++++++++
13 files changed, 69 insertions(+), 17 deletions(-)
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH v5 1/8] package/pkg-generic: host variant inherits target download settings
2022-03-18 13:24 [Buildroot] [PATCH v5 0/8] boot/optee-os: support new optee-os 3.16.0 build dependencies Clément Léger via buildroot
@ 2022-03-18 13:24 ` Clément Léger via buildroot
2022-03-18 22:33 ` Yann E. MORIN
2022-03-18 13:24 ` [Buildroot] [PATCH v5 2/8] package/python-cryptography: enable host package Clément Léger via buildroot
` (7 subsequent siblings)
8 siblings, 1 reply; 17+ messages in thread
From: Clément Léger via buildroot @ 2022-03-18 13:24 UTC (permalink / raw)
To: buildroot
Cc: Etienne Carriere, Clément Léger, Yann E . MORIN,
Thomas Petazzoni
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
It seems reasonable to expect that the download of the host and target
variants should usually be exactly the same and thus reuse the target
package values for the host package. This commits add support to
inherit host _DL_SUBDIR, _DOWNLOAD_DEPENDENCIES, _DL_ENV and
_DOwNLOAD_POST_PROCESS variables from target ones. These variables can
still be overriden if necessary for the host package.
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Clément Léger <clement.leger@bootlin.com>
---
package/pkg-generic.mk | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
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)
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH v5 2/8] package/python-cryptography: enable host package
2022-03-18 13:24 [Buildroot] [PATCH v5 0/8] boot/optee-os: support new optee-os 3.16.0 build dependencies Clément Léger via buildroot
2022-03-18 13:24 ` [Buildroot] [PATCH v5 1/8] package/pkg-generic: host variant inherits target download settings Clément Léger via buildroot
@ 2022-03-18 13:24 ` Clément Léger via buildroot
2022-03-18 22:32 ` Yann E. MORIN
2022-03-18 13:24 ` [Buildroot] [PATCH v5 3/8] boot/optee-os: add support to build with python-cryptography Clément Léger via buildroot
` (6 subsequent siblings)
8 siblings, 1 reply; 17+ messages in thread
From: Clément Léger via buildroot @ 2022-03-18 13:24 UTC (permalink / raw)
To: buildroot
Cc: Etienne Carriere, Clément Léger, Yann E . MORIN,
Thomas Petazzoni
Enable host package and add needed variables. Host POST_PROCESS and
DOWNLOAD_DEPENDENCIES variables are inherited from target ones.
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 | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk
index a524f729c8..872ede9b89 100644
--- a/package/python-cryptography/python-cryptography.mk
+++ b/package/python-cryptography/python-cryptography.mk
@@ -17,14 +17,26 @@ 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
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
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH v5 3/8] boot/optee-os: add support to build with python-cryptography
2022-03-18 13:24 [Buildroot] [PATCH v5 0/8] boot/optee-os: support new optee-os 3.16.0 build dependencies Clément Léger via buildroot
2022-03-18 13:24 ` [Buildroot] [PATCH v5 1/8] package/pkg-generic: host variant inherits target download settings Clément Léger via buildroot
2022-03-18 13:24 ` [Buildroot] [PATCH v5 2/8] package/python-cryptography: enable host package Clément Léger via buildroot
@ 2022-03-18 13:24 ` Clément Léger via buildroot
2022-03-18 22:32 ` Yann E. MORIN
2022-03-18 13:24 ` [Buildroot] [PATCH v5 4/8] boot/optee-os: bump to version 3.16.0 Clément Léger via buildroot
` (5 subsequent siblings)
8 siblings, 1 reply; 17+ messages in thread
From: Clément Léger via buildroot @ 2022-03-18 13:24 UTC (permalink / raw)
To: buildroot
Cc: Etienne Carriere, Clément Léger, Yann E . MORIN,
Thomas Petazzoni
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 ea16550b72..02b5d7c86f 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
@@ -61,6 +62,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_CORE
bool "Build core"
default y
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
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH v5 4/8] boot/optee-os: bump to version 3.16.0
2022-03-18 13:24 [Buildroot] [PATCH v5 0/8] boot/optee-os: support new optee-os 3.16.0 build dependencies Clément Léger via buildroot
` (2 preceding siblings ...)
2022-03-18 13:24 ` [Buildroot] [PATCH v5 3/8] boot/optee-os: add support to build with python-cryptography Clément Léger via buildroot
@ 2022-03-18 13:24 ` Clément Léger via buildroot
2022-03-18 22:40 ` Yann E. MORIN
2022-03-18 13:24 ` [Buildroot] [PATCH v5 5/8] package/optee-test: " Clément Léger via buildroot
` (4 subsequent siblings)
8 siblings, 1 reply; 17+ messages in thread
From: Clément Léger via buildroot @ 2022-03-18 13:24 UTC (permalink / raw)
To: buildroot
Cc: Etienne Carriere, Clément Léger, Yann E . MORIN,
Thomas Petazzoni
Bump OP-TEE OS package version to OP-TEE release 3.16.0 and set
BR2_TARGET_OPTEE_OS_LATEST to select
BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY 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 02b5d7c86f..811937e025 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.
@@ -51,7 +52,7 @@ endif
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
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH v5 5/8] package/optee-test: bump to version 3.16.0
2022-03-18 13:24 [Buildroot] [PATCH v5 0/8] boot/optee-os: support new optee-os 3.16.0 build dependencies Clément Léger via buildroot
` (3 preceding siblings ...)
2022-03-18 13:24 ` [Buildroot] [PATCH v5 4/8] boot/optee-os: bump to version 3.16.0 Clément Léger via buildroot
@ 2022-03-18 13:24 ` Clément Léger via buildroot
2022-03-18 13:24 ` [Buildroot] [PATCH v5 6/8] package/optee-examples: " Clément Léger via buildroot
` (3 subsequent siblings)
8 siblings, 0 replies; 17+ messages in thread
From: Clément Léger via buildroot @ 2022-03-18 13:24 UTC (permalink / raw)
To: buildroot
Cc: Etienne Carriere, Clément Léger, Yann E . MORIN,
Thomas Petazzoni
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
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH v5 6/8] package/optee-examples: bump to version 3.16.0
2022-03-18 13:24 [Buildroot] [PATCH v5 0/8] boot/optee-os: support new optee-os 3.16.0 build dependencies Clément Léger via buildroot
` (4 preceding siblings ...)
2022-03-18 13:24 ` [Buildroot] [PATCH v5 5/8] package/optee-test: " Clément Léger via buildroot
@ 2022-03-18 13:24 ` Clément Léger via buildroot
2022-03-18 13:24 ` [Buildroot] [PATCH v5 7/8] package/optee-client: " Clément Léger via buildroot
` (2 subsequent siblings)
8 siblings, 0 replies; 17+ messages in thread
From: Clément Léger via buildroot @ 2022-03-18 13:24 UTC (permalink / raw)
To: buildroot
Cc: Etienne Carriere, Clément Léger, Yann E . MORIN,
Thomas Petazzoni
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
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH v5 7/8] package/optee-client: bump to version 3.16.0
2022-03-18 13:24 [Buildroot] [PATCH v5 0/8] boot/optee-os: support new optee-os 3.16.0 build dependencies Clément Léger via buildroot
` (5 preceding siblings ...)
2022-03-18 13:24 ` [Buildroot] [PATCH v5 6/8] package/optee-examples: " Clément Léger via buildroot
@ 2022-03-18 13:24 ` Clément Léger via buildroot
2022-03-18 13:24 ` [Buildroot] [PATCH v5 8/8] package/optee-benchmark: " Clément Léger via buildroot
2022-03-18 22:46 ` [Buildroot] [PATCH v5 0/8] boot/optee-os: support new optee-os 3.16.0 build dependencies Yann E. MORIN
8 siblings, 0 replies; 17+ messages in thread
From: Clément Léger via buildroot @ 2022-03-18 13:24 UTC (permalink / raw)
To: buildroot
Cc: Etienne Carriere, Clément Léger, Yann E . MORIN,
Thomas Petazzoni
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
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH v5 8/8] package/optee-benchmark: bump to version 3.16.0
2022-03-18 13:24 [Buildroot] [PATCH v5 0/8] boot/optee-os: support new optee-os 3.16.0 build dependencies Clément Léger via buildroot
` (6 preceding siblings ...)
2022-03-18 13:24 ` [Buildroot] [PATCH v5 7/8] package/optee-client: " Clément Léger via buildroot
@ 2022-03-18 13:24 ` Clément Léger via buildroot
2022-03-18 22:46 ` [Buildroot] [PATCH v5 0/8] boot/optee-os: support new optee-os 3.16.0 build dependencies Yann E. MORIN
8 siblings, 0 replies; 17+ messages in thread
From: Clément Léger via buildroot @ 2022-03-18 13:24 UTC (permalink / raw)
To: buildroot
Cc: Etienne Carriere, Clément Léger, Yann E . MORIN,
Thomas Petazzoni
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
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [Buildroot] [PATCH v5 3/8] boot/optee-os: add support to build with python-cryptography
2022-03-18 13:24 ` [Buildroot] [PATCH v5 3/8] boot/optee-os: add support to build with python-cryptography Clément Léger via buildroot
@ 2022-03-18 22:32 ` Yann E. MORIN
2022-03-19 9:17 ` Thomas Petazzoni via buildroot
0 siblings, 1 reply; 17+ messages in thread
From: Yann E. MORIN @ 2022-03-18 22:32 UTC (permalink / raw)
To: Clément Léger; +Cc: Etienne Carriere, Thomas Petazzoni, buildroot
Clément, All,
On 2022-03-18 14:24 +0100, Clément Léger spake thusly:
> 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 ea16550b72..02b5d7c86f 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
That's wrong: 3.15.0 still does not need host-python-cryptography.
Furthermore, even after we bump to 3.16.0, since we can choose an
arbitrary git tree at an arbitrary commit, it is still possible to
point to a version of optee-os that does not require it either.
So, that dependency only really belongs...
> help
> OP-TEE OS provides the secure world boot image and the trust
> application development kit of the OP-TEE project. OP-TEE OS
> @@ -61,6 +62,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"
... here.
Applied to master with this fixed, mraou.
Regards,
Yann E. MORIN.
> + 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_CORE
> bool "Build core"
> default y
> 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
>
--
.-----------------.--------------------.------------------.--------------------.
| 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
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [Buildroot] [PATCH v5 2/8] package/python-cryptography: enable host package
2022-03-18 13:24 ` [Buildroot] [PATCH v5 2/8] package/python-cryptography: enable host package Clément Léger via buildroot
@ 2022-03-18 22:32 ` Yann E. MORIN
0 siblings, 0 replies; 17+ messages in thread
From: Yann E. MORIN @ 2022-03-18 22:32 UTC (permalink / raw)
To: Clément Léger; +Cc: Etienne Carriere, Thomas Petazzoni, buildroot
Clément, All,
On 2022-03-18 14:24 +0100, Clément Léger spake thusly:
> Enable host package and add needed variables. Host POST_PROCESS and
> DOWNLOAD_DEPENDENCIES variables are inherited from target ones.
>
> Acked-by: Etienne Carriere <etienne.carriere@linaro.org>
> Signed-off-by: Clément Léger <clement.leger@bootlin.com>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> package/python-cryptography/python-cryptography.mk | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
>
> diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk
> index a524f729c8..872ede9b89 100644
> --- a/package/python-cryptography/python-cryptography.mk
> +++ b/package/python-cryptography/python-cryptography.mk
> @@ -17,14 +17,26 @@ 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
> 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
>
--
.-----------------.--------------------.------------------.--------------------.
| 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
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [Buildroot] [PATCH v5 1/8] package/pkg-generic: host variant inherits target download settings
2022-03-18 13:24 ` [Buildroot] [PATCH v5 1/8] package/pkg-generic: host variant inherits target download settings Clément Léger via buildroot
@ 2022-03-18 22:33 ` Yann E. MORIN
0 siblings, 0 replies; 17+ messages in thread
From: Yann E. MORIN @ 2022-03-18 22:33 UTC (permalink / raw)
To: Clément Léger; +Cc: Etienne Carriere, Thomas Petazzoni, buildroot
Clément, All,
On 2022-03-18 14:24 +0100, Clément Léger spake thusly:
> From: "Yann E. MORIN" <yann.morin.1998@free.fr>
>
> It seems reasonable to expect that the download of the host and target
> variants should usually be exactly the same and thus reuse the target
> package values for the host package. This commits add support to
> inherit host _DL_SUBDIR, _DOWNLOAD_DEPENDENCIES, _DL_ENV and
> _DOwNLOAD_POST_PROCESS variables from target ones. These variables can
> still be overriden if necessary for the host package.
>
> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> Signed-off-by: Clément Léger <clement.leger@bootlin.com>
As Thomas also hinted he agreed on the principle: applied to master,
thanks.
Regards,
Yann E. MORIN.
> ---
> package/pkg-generic.mk | 24 ++++++++++++++++++++++++
> 1 file changed, 24 insertions(+)
>
> 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)
> --
> 2.34.1
>
--
.-----------------.--------------------.------------------.--------------------.
| 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
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [Buildroot] [PATCH v5 4/8] boot/optee-os: bump to version 3.16.0
2022-03-18 13:24 ` [Buildroot] [PATCH v5 4/8] boot/optee-os: bump to version 3.16.0 Clément Léger via buildroot
@ 2022-03-18 22:40 ` Yann E. MORIN
2022-03-21 7:46 ` Clément Léger via buildroot
0 siblings, 1 reply; 17+ messages in thread
From: Yann E. MORIN @ 2022-03-18 22:40 UTC (permalink / raw)
To: Clément Léger; +Cc: Etienne Carriere, Thomas Petazzoni, buildroot
Clément, All,
On 2022-03-18 14:24 +0100, Clément Léger spake thusly:
> Bump OP-TEE OS package version to OP-TEE release 3.16.0 and set
> BR2_TARGET_OPTEE_OS_LATEST to select
> BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY 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 02b5d7c86f..811937e025 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"
3.16.0 now needs the dependency on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS,
so if that is not met, there will only be the custom git as a fallback.
This is not so nice that the latest has to, well, be the latest, and
that we don;t keep 3.15.0 around for those that can't have a host rustc
compiler.
But then, who are we kidding? Builds on non-x86 are pretty rare yet;
even if some people might be on PPC or AArch64, they still are to be
no much more than two-handful (1023).
Also, check-package whines;
$ make check-package
boot/optee-os/Config.in:22: attributes order: type, default, depends
on, select, help (http://nightly.buildroot.org/#_config_files)
And a hidden one:
boot/optee-os/optee-os.hash:4: separation does not match expectation
(http://nightly.buildroot.org/#adding-packages-hash)
Applied to master with those fixed, thanks.
Regards,
Yann E. MORIN.
> help
> Use the latest release tag from the OP-TEE OS official Git
> repository.
> @@ -51,7 +52,7 @@ endif
>
> 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
>
--
.-----------------.--------------------.------------------.--------------------.
| 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
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [Buildroot] [PATCH v5 0/8] boot/optee-os: support new optee-os 3.16.0 build dependencies
2022-03-18 13:24 [Buildroot] [PATCH v5 0/8] boot/optee-os: support new optee-os 3.16.0 build dependencies Clément Léger via buildroot
` (7 preceding siblings ...)
2022-03-18 13:24 ` [Buildroot] [PATCH v5 8/8] package/optee-benchmark: " Clément Léger via buildroot
@ 2022-03-18 22:46 ` Yann E. MORIN
8 siblings, 0 replies; 17+ messages in thread
From: Yann E. MORIN @ 2022-03-18 22:46 UTC (permalink / raw)
To: Clément Léger; +Cc: Etienne Carriere, Thomas Petazzoni, buildroot
Clément, All,
On 2022-03-18 14:24 +0100, Clément Léger spake thusly:
> 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.
[--SNIP--]
> Clément Léger (7):
> 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
Whole series applied to master, thanks.
Regards,
Yann E. MORIN.
> Yann E. MORIN (1):
> package/pkg-generic: host variant inherits target download settings
>
> boot/optee-os/Config.in | 14 +++++++++--
> boot/optee-os/optee-os.hash | 4 ++--
> boot/optee-os/optee-os.mk | 8 ++++++-
> 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/pkg-generic.mk | 24 +++++++++++++++++++
> .../python-cryptography.mk | 12 ++++++++++
> 13 files changed, 69 insertions(+), 17 deletions(-)
>
> --
> 2.34.1
>
--
.-----------------.--------------------.------------------.--------------------.
| 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
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [Buildroot] [PATCH v5 3/8] boot/optee-os: add support to build with python-cryptography
2022-03-18 22:32 ` Yann E. MORIN
@ 2022-03-19 9:17 ` Thomas Petazzoni via buildroot
2022-03-19 9:46 ` Yann E. MORIN
0 siblings, 1 reply; 17+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-03-19 9:17 UTC (permalink / raw)
To: Yann E. MORIN; +Cc: Etienne Carriere, Clément Léger, buildroot
On Fri, 18 Mar 2022 23:32:21 +0100
"Yann E. MORIN" <yann.morin.1998@free.fr> wrote:
> > diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in
> > index ea16550b72..02b5d7c86f 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
>
> That's wrong: 3.15.0 still does not need host-python-cryptography.
>
> Furthermore, even after we bump to 3.16.0, since we can choose an
> arbitrary git tree at an arbitrary commit, it is still possible to
> point to a version of optee-os that does not require it either.
>
> So, that dependency only really belongs...
>
> > help
> > OP-TEE OS provides the secure world boot image and the trust
> > application development kit of the OP-TEE project. OP-TEE OS
> > @@ -61,6 +62,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"
>
> ... here.
Yes and no. Because as soon as the BR2_TARGET_OPTEE_OS_LATEST gets
bumped to 3.16.0, then our default selection for OP-TEE (unless you
chose a custom Git version) will require python-cryptography. So to
keep things simple, I asked Clément to add this dependency to the
whole package.
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
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [Buildroot] [PATCH v5 3/8] boot/optee-os: add support to build with python-cryptography
2022-03-19 9:17 ` Thomas Petazzoni via buildroot
@ 2022-03-19 9:46 ` Yann E. MORIN
0 siblings, 0 replies; 17+ messages in thread
From: Yann E. MORIN @ 2022-03-19 9:46 UTC (permalink / raw)
To: Thomas Petazzoni; +Cc: Etienne Carriere, Clément Léger, buildroot
Thomas, All,
On 2022-03-19 10:17 +0100, Thomas Petazzoni spake thusly:
> On Fri, 18 Mar 2022 23:32:21 +0100
> "Yann E. MORIN" <yann.morin.1998@free.fr> wrote:
>
> > > diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in
> > > index ea16550b72..02b5d7c86f 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
> >
> > That's wrong: 3.15.0 still does not need host-python-cryptography.
> >
> > Furthermore, even after we bump to 3.16.0, since we can choose an
> > arbitrary git tree at an arbitrary commit, it is still possible to
> > point to a version of optee-os that does not require it either.
> >
> > So, that dependency only really belongs...
> >
> > > help
> > > OP-TEE OS provides the secure world boot image and the trust
> > > application development kit of the OP-TEE project. OP-TEE OS
> > > @@ -61,6 +62,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"
> >
> > ... here.
>
> Yes and no. Because as soon as the BR2_TARGET_OPTEE_OS_LATEST gets
> bumped to 3.16.0, then our default selection for OP-TEE (unless you
> chose a custom Git version) will require python-cryptography. So to
> keep things simple, I asked Clément to add this dependency to the
> whole package.
But that's the point: you can still choose a custom git tree that points
to an earlier, pre-3.16.0 tree, which will still be buildable without
pytho-cryptography.
But yes, you got a point: I forgot to guard the default clause in the
choice, with the same dependency. I'll submit a patch.
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
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [Buildroot] [PATCH v5 4/8] boot/optee-os: bump to version 3.16.0
2022-03-18 22:40 ` Yann E. MORIN
@ 2022-03-21 7:46 ` Clément Léger via buildroot
0 siblings, 0 replies; 17+ messages in thread
From: Clément Léger via buildroot @ 2022-03-21 7:46 UTC (permalink / raw)
To: Yann E. MORIN; +Cc: Etienne Carriere, Thomas Petazzoni, buildroot
Le Fri, 18 Mar 2022 23:40:31 +0100,
"Yann E. MORIN" <yann.morin.1998@free.fr> a écrit :
> 3.16.0 now needs the dependency on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS,
> so if that is not met, there will only be the custom git as a fallback.
>
> This is not so nice that the latest has to, well, be the latest, and
> that we don;t keep 3.15.0 around for those that can't have a host rustc
> compiler.
>
> But then, who are we kidding? Builds on non-x86 are pretty rare yet;
> even if some people might be on PPC or AArch64, they still are to be
> no much more than two-handful (1023).
>
> Also, check-package whines;
>
> $ make check-package
> boot/optee-os/Config.in:22: attributes order: type, default, depends
> on, select, help (http://nightly.buildroot.org/#_config_files)
Hi Yann,
Sorry for the errors and thanks for the hint, I will use that next time
I submit a patch for a package.
>
> And a hidden one:
>
> boot/optee-os/optee-os.hash:4: separation does not match expectation
> (http://nightly.buildroot.org/#adding-packages-hash)
>
> Applied to master with those fixed, thanks.
>
> Regards,
> Yann E. MORIN.
--
Clément Léger,
Embedded Linux and Kernel engineer at Bootlin
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2022-03-21 7:47 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-18 13:24 [Buildroot] [PATCH v5 0/8] boot/optee-os: support new optee-os 3.16.0 build dependencies Clément Léger via buildroot
2022-03-18 13:24 ` [Buildroot] [PATCH v5 1/8] package/pkg-generic: host variant inherits target download settings Clément Léger via buildroot
2022-03-18 22:33 ` Yann E. MORIN
2022-03-18 13:24 ` [Buildroot] [PATCH v5 2/8] package/python-cryptography: enable host package Clément Léger via buildroot
2022-03-18 22:32 ` Yann E. MORIN
2022-03-18 13:24 ` [Buildroot] [PATCH v5 3/8] boot/optee-os: add support to build with python-cryptography Clément Léger via buildroot
2022-03-18 22:32 ` Yann E. MORIN
2022-03-19 9:17 ` Thomas Petazzoni via buildroot
2022-03-19 9:46 ` Yann E. MORIN
2022-03-18 13:24 ` [Buildroot] [PATCH v5 4/8] boot/optee-os: bump to version 3.16.0 Clément Léger via buildroot
2022-03-18 22:40 ` Yann E. MORIN
2022-03-21 7:46 ` Clément Léger via buildroot
2022-03-18 13:24 ` [Buildroot] [PATCH v5 5/8] package/optee-test: " Clément Léger via buildroot
2022-03-18 13:24 ` [Buildroot] [PATCH v5 6/8] package/optee-examples: " Clément Léger via buildroot
2022-03-18 13:24 ` [Buildroot] [PATCH v5 7/8] package/optee-client: " Clément Léger via buildroot
2022-03-18 13:24 ` [Buildroot] [PATCH v5 8/8] package/optee-benchmark: " Clément Léger via buildroot
2022-03-18 22:46 ` [Buildroot] [PATCH v5 0/8] boot/optee-os: support new optee-os 3.16.0 build dependencies Yann E. MORIN
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.