| Message ID | f25cf981ca8a67c30ac2b994980a9f26aceb1dd2.1572355772.git.etienne.carriere@linaro.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/5] boot/optee-os: bump version to 3.7.0 | expand |
On 29/10/2019 15:41, Etienne Carriere wrote: > Bump OP-TEE OS package version to OP-TEE release 3.7.0. > > This adds host-python-pyelftools to optee-os dependencies > > Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org> Series applied to master, thanks. Just to be clear though: there is no version dependency between all these packages? I.e., it is possible to run optee-examples 3.7.0 with optee-os 3.1.0? (Barring bugs/regressions of course.) If there is a version dependency, then we'd have to get a version string from the user if BR2_TARGET_OPTEE_OS_CUSTOM_GIT is used, and use that version for the linux components. Regards, Arnout
Hello Arnout, On Tue, 29 Oct 2019 at 22:31, Arnout Vandecappelle <arnout@mind.be> wrote: > > > > On 29/10/2019 15:41, Etienne Carriere wrote: > > Bump OP-TEE OS package version to OP-TEE release 3.7.0. > > > > This adds host-python-pyelftools to optee-os dependencies > > > > Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org> > > Series applied to master, thanks. > > Just to be clear though: there is no version dependency between all these > packages? I.e., it is possible to run optee-examples 3.7.0 with optee-os 3.1.0? > (Barring bugs/regressions of course.) > > If there is a version dependency, then we'd have to get a version string from > the user if BR2_TARGET_OPTEE_OS_CUSTOM_GIT is used, and use that version for the > linux components. Yes, that's true, there are dependencies. When not satisfying these, one can face build or runtime failures. As for now, it is recommended to always synchronize package/optee-* packages with boot/optee-os package. Using an older OP-TEE revision with BR currently needs one to use external packages, whatever way (i.e. src_override). I cannot tell whether BR should natively provide support for previous versions. That said, yes, I think it would be fine some older versions are still supported. I can give it a try for few older version numbers. Regards, Etienne > > Regards, > Arnout >
Hi Etienne, Le 29/10/2019 à 15:41, Etienne Carriere a écrit : > Bump OP-TEE OS package version to OP-TEE release 3.7.0. > > This adds host-python-pyelftools to optee-os dependencies > > Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org> > --- There is a build issue with optee-os: make[1]: Entering directory 'output/build/optee-os-3.7.0' GEN out/core/include/generated/arm32_sysreg.h GEN out/core/include/generated/arm32_sysreg.S CHK out/conf.mk GEN out/core/ta_pub_key.c UPD out/conf.mk TOUCH out/core/tee-pageable.bin GEN out/include/generated/arm32_user_sysreg.h Traceback (most recent call last): File "scripts/pem_to_pub_c.py", line 61, in <module> main() File "scripts/pem_to_pub_c.py", line 24, in main from Crypto.PublicKey import RSA ImportError: No module named 'Crypto' mk/subdir.mk:159: recipe for target 'out/core/ta_pub_key.c' failed I would add host-python-pycrypto in the dependencies. Best regards, Romain
Hello Romain, On Sun, 17 Nov 2019 at 23:23, Romain Naour <romain.naour@smile.fr> wrote: > > Hi Etienne, > > Le 29/10/2019 à 15:41, Etienne Carriere a écrit : > > Bump OP-TEE OS package version to OP-TEE release 3.7.0. > > > > This adds host-python-pyelftools to optee-os dependencies > > > > Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org> > > --- > > There is a build issue with optee-os: > > make[1]: Entering directory 'output/build/optee-os-3.7.0' > GEN out/core/include/generated/arm32_sysreg.h > GEN out/core/include/generated/arm32_sysreg.S > CHK out/conf.mk > GEN out/core/ta_pub_key.c > UPD out/conf.mk > TOUCH out/core/tee-pageable.bin > GEN out/include/generated/arm32_user_sysreg.h > Traceback (most recent call last): > File "scripts/pem_to_pub_c.py", line 61, in <module> > main() > File "scripts/pem_to_pub_c.py", line 24, in main > from Crypto.PublicKey import RSA > ImportError: No module named 'Crypto' > mk/subdir.mk:159: recipe for target 'out/core/ta_pub_key.c' failed > > I would add host-python-pycrypto in the dependencies. I'm surprised as the patch adds host-python-pyelftools to OPTEE_OS_DEPENDENCIES which already specifies host-python-pycrypto: > > -OPTEE_OS_DEPENDENCIES = host-openssl host-python-pycrypto > > +OPTEE_OS_DEPENDENCIES = host-openssl host-python-pycrypto host-python-pyelftools Did I miss something? Regards, Etienne > > Best regards, > Romain
Hello Etienne, Le 18/11/2019 à 10:36, Etienne Carriere a écrit : > Hello Romain, > > On Sun, 17 Nov 2019 at 23:23, Romain Naour <romain.naour@smile.fr> wrote: >> >> Hi Etienne, >> >> Le 29/10/2019 à 15:41, Etienne Carriere a écrit : >>> Bump OP-TEE OS package version to OP-TEE release 3.7.0. >>> >>> This adds host-python-pyelftools to optee-os dependencies >>> >>> Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org> >>> --- >> >> There is a build issue with optee-os: >> >> make[1]: Entering directory 'output/build/optee-os-3.7.0' >> GEN out/core/include/generated/arm32_sysreg.h >> GEN out/core/include/generated/arm32_sysreg.S >> CHK out/conf.mk >> GEN out/core/ta_pub_key.c >> UPD out/conf.mk >> TOUCH out/core/tee-pageable.bin >> GEN out/include/generated/arm32_user_sysreg.h >> Traceback (most recent call last): >> File "scripts/pem_to_pub_c.py", line 61, in <module> >> main() >> File "scripts/pem_to_pub_c.py", line 24, in main >> from Crypto.PublicKey import RSA >> ImportError: No module named 'Crypto' >> mk/subdir.mk:159: recipe for target 'out/core/ta_pub_key.c' failed >> >> I would add host-python-pycrypto in the dependencies. > > I'm surprised as the patch adds host-python-pyelftools to > OPTEE_OS_DEPENDENCIES which already specifies host-python-pycrypto: Ok > >>> -OPTEE_OS_DEPENDENCIES = host-openssl host-python-pycrypto >>> +OPTEE_OS_DEPENDENCIES = host-openssl host-python-pycrypto host-python-pyelftools > > Did I miss something? The issue has been detected by the gitlab CI https://gitlab.com/buildroot.org/buildroot/-/jobs/352841047 Are we sure to use the correct python interpreter ? Maybe we have to provide the path to output/host/bin/python otherwise it will use /usr/bin/python ? Best regards, Romain > > Regards, > Etienne > >> >> Best regards, >> Romain
diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 18b81ab01d..669bbda924 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.5.0" + bool "3.7.0" help Use the latest release tag from the OP-TEE OS official Git repository. @@ -50,7 +50,7 @@ endif config BR2_TARGET_OPTEE_OS_VERSION string - default "3.5.0" if BR2_TARGET_OPTEE_OS_LATEST + default "3.7.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 1c8f5d6b31..dc0fbecce7 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.5.0.tar.gz -sha256 a02fe8e7fdee9653e9207059071735a839b1255fdaf311a2a6cfd185a4cee6a2 optee-os-3.5.0.tar.gz +# From https://github.com/OP-TEE/optee_os/archive/3.7.0.tar.gz +sha256 ff378f22b8e7dacf933a2d34eb5c1bdcafe74bdda692e4dbc2969301f6a81d43 optee-os-3.7.0.tar.gz # Locally computed sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 28f5add480..bedde85212 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -19,7 +19,7 @@ else OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION)) endif -OPTEE_OS_DEPENDENCIES = host-openssl host-python-pycrypto +OPTEE_OS_DEPENDENCIES = host-openssl host-python-pycrypto host-python-pyelftools # On 64bit targets, OP-TEE OS can be built in 32bit mode, or # can be built in 64bit mode and support 32bit and 64bit
Bump OP-TEE OS package version to OP-TEE release 3.7.0. This adds host-python-pyelftools to optee-os dependencies Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org> --- boot/optee-os/Config.in | 4 ++-- boot/optee-os/optee-os.hash | 4 ++-- boot/optee-os/optee-os.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)