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

[Buildroot] [PATCH 0/3] 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.

Clément Léger (3):
  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

 boot/optee-os/Config.in                            | 13 +++++++++++--
 boot/optee-os/optee-os.hash                        |  3 +--
 boot/optee-os/optee-os.mk                          |  7 ++++++-
 package/python-cryptography/python-cryptography.mk |  7 +++++++
 4 files changed, 25 insertions(+), 5 deletions(-)

-- 
2.34.1

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

[Buildroot] [PATCH 1/3] package/python-cryptography: enable host package

[Clément Léger via buildroot]

Enable host package and add needed dependencies.

Signed-off-by: Clément Léger <clement.leger@bootlin.com>
---
 package/python-cryptography/python-cryptography.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk
index a524f729c8..4ff61c7f86 100644
--- a/package/python-cryptography/python-cryptography.mk
+++ b/package/python-cryptography/python-cryptography.mk
@@ -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))
-- 
2.34.1

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

[Buildroot] [PATCH 2/3] 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.

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

diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in
index 0974578484..f8426f9ab2 100644
--- a/boot/optee-os/Config.in
+++ b/boot/optee-os/Config.in
@@ -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
diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk
index 166b5e693c..57f9a17bb6 100644
--- a/boot/optee-os/optee-os.mk
+++ b/boot/optee-os/optee-os.mk
@@ -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
-- 
2.34.1

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

[Buildroot] [PATCH 3/3] 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.

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

diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in
index f8426f9ab2..6fe2ae95ac 100644
--- a/boot/optee-os/Config.in
+++ b/boot/optee-os/Config.in
@@ -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
 
diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash
index 3c32e25b36..b3276d702a 100644
--- a/boot/optee-os/optee-os.hash
+++ b/boot/optee-os/optee-os.hash
@@ -1,4 +1,3 @@
-# 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
 # Locally computed
+sha256 ebc8e18ad2039ee97c34f74a7546de9119e26f04c368b6c7fd0c55f93d33d2d6  optee-os-3.16.0.tar.gz
 sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a  LICENSE
-- 
2.34.1

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

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

[Clément Léger via buildroot]

Le Thu, 10 Mar 2022 09:07:42 +0100,
Clément Léger <clement.leger@bootlin.com> a écrit :

> 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.
> 
> Clément Léger (3):
>   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
> 
>  boot/optee-os/Config.in                            | 13 +++++++++++--
>  boot/optee-os/optee-os.hash                        |  3 +--
>  boot/optee-os/optee-os.mk                          |  7 ++++++-
>  package/python-cryptography/python-cryptography.mk |  7 +++++++
>  4 files changed, 25 insertions(+), 5 deletions(-)
> 

Actually, all optee packages needs to be updated to 3.16.0. Please
ignore this version. I'll send a V2 updating other packages.

Thanks,

-- 
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

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

[Etienne Carriere]

Hello Clément,

Thanks for upgrading optee.

Regards,
Etienne

On Thu, 10 Mar 2022 at 14:30, Clément Léger <clement.leger@bootlin.com> wrote:
>
> Le Thu, 10 Mar 2022 09:07:42 +0100,
> Clément Léger <clement.leger@bootlin.com> a écrit :
>
> > 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.
> >
> > Clément Léger (3):
> >   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
> >
> >  boot/optee-os/Config.in                            | 13 +++++++++++--
> >  boot/optee-os/optee-os.hash                        |  3 +--
> >  boot/optee-os/optee-os.mk                          |  7 ++++++-
> >  package/python-cryptography/python-cryptography.mk |  7 +++++++
> >  4 files changed, 25 insertions(+), 5 deletions(-)
> >
>
> Actually, all optee packages needs to be updated to 3.16.0. Please
> ignore this version. I'll send a V2 updating other packages.
>
> Thanks,
>
> --
> 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