[ptxdist] [PATCH 0/4] OP-TEE Bump to 3.6.0

[ptxdist] [PATCH 0/4] OP-TEE Bump to 3.6.0

[Rouven Czerwinski]

Hi,

this series updates OP-TEE, the client library and tests to 3.6.0.
It also includes a new build time dependency on pyelftools in the
python3 version, which is added to the host-system-python3 rules.

Cheers,
Rouven Czerwinski

Rouven Czerwinski (4):
  host-system-python3: add pyelftools
  optee: version bump 3.5.0 → 3.6.0
  optee-client: version bump 3.5.0 → 3.6.0
  optee-test: version bump 3.5.0 → 3.6.0

 platforms/optee.in             | 1 +
 rules/host-system-python3.in   | 3 +++
 rules/host-system-python3.make | 6 ++++++
 rules/optee-client.make        | 4 ++--
 rules/optee-test.make          | 4 ++--
 rules/optee.make               | 4 ++--
 6 files changed, 16 insertions(+), 6 deletions(-)

base-commit: a653df5d3f35d3936ffb1be4bc852f576c3f89f3
-- 
git-series 0.9.1

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 1/4] host-system-python3: add pyelftools

[Rouven Czerwinski]

OP-TEE OS 3.6.0 has a build time dependency on pyelftools, add it to
host-system-python3 to notify the user if it is not available.

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
 rules/host-system-python3.in   | 3 +++
 rules/host-system-python3.make | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/rules/host-system-python3.in b/rules/host-system-python3.in
index e0ab5e8..39d6727 100644
--- a/rules/host-system-python3.in
+++ b/rules/host-system-python3.in
@@ -17,4 +17,7 @@ config HOST_SYSTEM_PYTHON3_NUMPY
 config HOST_SYSTEM_PYTHON3_SIX
 	bool
 
+config HOST_SYSTEM_PYTHON3_PYELFTOOLS
+	bool
+
 endif
diff --git a/rules/host-system-python3.make b/rules/host-system-python3.make
index f5293be..02a1793 100644
--- a/rules/host-system-python3.make
+++ b/rules/host-system-python3.make
@@ -48,6 +48,12 @@ ifdef PTXCONF_HOST_SYSTEM_PYTHON3_SIX
 		ptxd_bailout "Python six module not found! \
 	Please install python3-six (debian)";
 endif
+ifdef PTXCONF_HOST_SYSTEM_PYTHON3_PYELFTOOLS
+	@echo "Checking for Python Pyelftools ..."
+	@$(SYSTEMPYTHON3) -c 'import elftools' 2>/dev/null || \
+		ptxd_bailout "Python elftools module not found! \
+	Please install python3-pyelftools (debian)";
+endif
 	@$(call touch)
 
 # vim: syntax=make
-- 
git-series 0.9.1

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/4] optee: version bump 3.5.0 → 3.6.0

[Rouven Czerwinski]

The OP-TEE build requires pyelftools in the python3 flavour now.

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
 platforms/optee.in | 1 +
 rules/optee.make   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/platforms/optee.in b/platforms/optee.in
index dc31f66..cfdd44b 100644
--- a/platforms/optee.in
+++ b/platforms/optee.in
@@ -5,6 +5,7 @@ menuconfig OPTEE
 	bool
 	depends on ARCH_ARM || ARCH_ARM64
 	depends on !ARCH_ARM64 || BROKEN
+	select HOST_SYSTEM_PYTHON3_PYELFTOOLS
 	help
 	  OP-TEE is an open source project which contains a full implementation
 	  to make up a complete Trusted Execution Environment. The project has
diff --git a/rules/optee.make b/rules/optee.make
index 56ec350..c5adfbc 100644
--- a/rules/optee.make
+++ b/rules/optee.make
@@ -16,8 +16,8 @@ endif
 #
 # Paths and names
 #
-OPTEE_VERSION	:= 3.5.0
-OPTEE_MD5	:= 18dac7e462abe072956a4a9e9139d1d5
+OPTEE_VERSION	:= 3.6.0
+OPTEE_MD5	:= 6adde95df70f303cd1752912fd0bd600
 OPTEE		:= optee-$(OPTEE_VERSION)
 OPTEE_SUFFIX	:= tar.gz
 OPTEE_URL	:= https://github.com/OP-TEE/optee_os/archive/$(OPTEE_VERSION).$(OPTEE_SUFFIX)
-- 
git-series 0.9.1

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 2/4] optee: version bump 3.5.0 → 3.6.0

[Lucas Stach]

Am Donnerstag, den 25.07.2019, 10:25 +0200 schrieb Rouven Czerwinski:
> The OP-TEE build requires pyelftools in the python3 flavour now.
> 
> Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
> ---
>  platforms/optee.in | 1 +
>  rules/optee.make   | 4 ++--
>  2 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/platforms/optee.in b/platforms/optee.in
> index dc31f66..cfdd44b 100644
> --- a/platforms/optee.in
> +++ b/platforms/optee.in
> @@ -5,6 +5,7 @@ menuconfig OPTEE
>  	bool
>  	depends on ARCH_ARM || ARCH_ARM64
>  	depends on !ARCH_ARM64 || BROKEN
> +	select HOST_SYSTEM_PYTHON3_PYELFTOOLS

Missing "select HOST_SYSTEM_PYTHON3".

>  	help
>  	  OP-TEE is an open source project which contains a full
> implementation
>  	  to make up a complete Trusted Execution Environment. The
> project has
> diff --git a/rules/optee.make b/rules/optee.make
> index 56ec350..c5adfbc 100644
> --- a/rules/optee.make
> +++ b/rules/optee.make
> @@ -16,8 +16,8 @@ endif
>  #
>  # Paths and names
>  #
> -OPTEE_VERSION	:= 3.5.0
> -OPTEE_MD5	:= 18dac7e462abe072956a4a9e9139d1d5
> +OPTEE_VERSION	:= 3.6.0
> +OPTEE_MD5	:= 6adde95df70f303cd1752912fd0bd600
>  OPTEE		:= optee-$(OPTEE_VERSION)
>  OPTEE_SUFFIX	:= tar.gz
>  OPTEE_URL	:= https://github.com/OP-TEE/optee_os/archive/$(OPT
> EE_VERSION).$(OPTEE_SUFFIX)

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 2/4] optee: version bump 3.5.0 → 3.6.0

[Rouven Czerwinski]

On Thu, 2019-07-25 at 10:53 +0200, Lucas Stach wrote:
> Am Donnerstag, den 25.07.2019, 10:25 +0200 schrieb Rouven Czerwinski:
> > The OP-TEE build requires pyelftools in the python3 flavour now.
> > 
> > Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
> > ---
> >  platforms/optee.in | 1 +
> >  rules/optee.make   | 4 ++--
> >  2 files changed, 3 insertions(+), 2 deletions(-)
> > 
> > diff --git a/platforms/optee.in b/platforms/optee.in
> > index dc31f66..cfdd44b 100644
> > --- a/platforms/optee.in
> > +++ b/platforms/optee.in
> > @@ -5,6 +5,7 @@ menuconfig OPTEE
> >  	bool
> >  	depends on ARCH_ARM || ARCH_ARM64
> >  	depends on !ARCH_ARM64 || BROKEN
> > +	select HOST_SYSTEM_PYTHON3_PYELFTOOLS
> 
> Missing "select HOST_SYSTEM_PYTHON3".

Thanks, fix queued for a V2.

Regards,
Rouven Czerwinski
-- 
Pengutronix e.K.                           |            		 |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 2/4] optee: version bump 3.5.0 → 3.6.0

[Michael Olbrich]

On Thu, Jul 25, 2019 at 11:05:18AM +0200, Rouven Czerwinski wrote:
> On Thu, 2019-07-25 at 10:53 +0200, Lucas Stach wrote:
> > Am Donnerstag, den 25.07.2019, 10:25 +0200 schrieb Rouven Czerwinski:
> > > The OP-TEE build requires pyelftools in the python3 flavour now.
> > > 
> > > Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
> > > ---
> > >  platforms/optee.in | 1 +
> > >  rules/optee.make   | 4 ++--
> > >  2 files changed, 3 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/platforms/optee.in b/platforms/optee.in
> > > index dc31f66..cfdd44b 100644
> > > --- a/platforms/optee.in
> > > +++ b/platforms/optee.in
> > > @@ -5,6 +5,7 @@ menuconfig OPTEE
> > >  	bool
> > >  	depends on ARCH_ARM || ARCH_ARM64
> > >  	depends on !ARCH_ARM64 || BROKEN
> > > +	select HOST_SYSTEM_PYTHON3_PYELFTOOLS
> > 
> > Missing "select HOST_SYSTEM_PYTHON3".
> 
> Thanks, fix queued for a V2.

Hmmm, optee currently selects HOST_SYSTEM_PYTHON as well (see
rules/optee.in). Do we really need both versions?

Michael

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 2/4] optee: version bump 3.5.0 → 3.6.0

[Rouven Czerwinski]

On Wed, 2019-08-07 at 12:57 +0200, Michael Olbrich wrote:
> On Thu, Jul 25, 2019 at 11:05:18AM +0200, Rouven Czerwinski wrote:
> > On Thu, 2019-07-25 at 10:53 +0200, Lucas Stach wrote:
> > > Am Donnerstag, den 25.07.2019, 10:25 +0200 schrieb Rouven
> > > Czerwinski:
> > > > The OP-TEE build requires pyelftools in the python3 flavour
> > > > now.
> > > > 
> > > > Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
> > > > ---
> > > >  platforms/optee.in | 1 +
> > > >  rules/optee.make   | 4 ++--
> > > >  2 files changed, 3 insertions(+), 2 deletions(-)
> > > > 
> > > > diff --git a/platforms/optee.in b/platforms/optee.in
> > > > index dc31f66..cfdd44b 100644
> > > > --- a/platforms/optee.in
> > > > +++ b/platforms/optee.in
> > > > @@ -5,6 +5,7 @@ menuconfig OPTEE
> > > >  	bool
> > > >  	depends on ARCH_ARM || ARCH_ARM64
> > > >  	depends on !ARCH_ARM64 || BROKEN
> > > > +	select HOST_SYSTEM_PYTHON3_PYELFTOOLS
> > > 
> > > Missing "select HOST_SYSTEM_PYTHON3".
> > 
> > Thanks, fix queued for a V2.
> 
> Hmmm, optee currently selects HOST_SYSTEM_PYTHON as well (see
> rules/optee.in). Do we really need both versions?

Unfortunately, yes. Currently not all scripts are converted to python3.
 
- rcz


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 2/4] optee: version bump 3.5.0 → 3.6.0

[Michael Olbrich]

On Wed, Aug 07, 2019 at 02:38:21PM +0200, Rouven Czerwinski wrote:
> On Wed, 2019-08-07 at 12:57 +0200, Michael Olbrich wrote:
> > On Thu, Jul 25, 2019 at 11:05:18AM +0200, Rouven Czerwinski wrote:
> > > On Thu, 2019-07-25 at 10:53 +0200, Lucas Stach wrote:
> > > > Am Donnerstag, den 25.07.2019, 10:25 +0200 schrieb Rouven
> > > > Czerwinski:
> > > > > The OP-TEE build requires pyelftools in the python3 flavour
> > > > > now.
> > > > > 
> > > > > Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
> > > > > ---
> > > > >  platforms/optee.in | 1 +
> > > > >  rules/optee.make   | 4 ++--
> > > > >  2 files changed, 3 insertions(+), 2 deletions(-)
> > > > > 
> > > > > diff --git a/platforms/optee.in b/platforms/optee.in
> > > > > index dc31f66..cfdd44b 100644
> > > > > --- a/platforms/optee.in
> > > > > +++ b/platforms/optee.in
> > > > > @@ -5,6 +5,7 @@ menuconfig OPTEE
> > > > >  	bool
> > > > >  	depends on ARCH_ARM || ARCH_ARM64
> > > > >  	depends on !ARCH_ARM64 || BROKEN
> > > > > +	select HOST_SYSTEM_PYTHON3_PYELFTOOLS
> > > > 
> > > > Missing "select HOST_SYSTEM_PYTHON3".
> > > 
> > > Thanks, fix queued for a V2.
> > 
> > Hmmm, optee currently selects HOST_SYSTEM_PYTHON as well (see
> > rules/optee.in). Do we really need both versions?
> 
> Unfortunately, yes. Currently not all scripts are converted to python3.

So we always need both versions at build-time? :-/
Please collect the dependencies in on file. I don't care if it's in rules/
or platforms/.

Michael

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 3/4] optee-client: version bump 3.5.0 → 3.6.0

[Rouven Czerwinski]

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
 rules/optee-client.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/optee-client.make b/rules/optee-client.make
index 7fbebf1..615ba23 100644
--- a/rules/optee-client.make
+++ b/rules/optee-client.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_OPTEE_CLIENT) += optee-client
 #
 # Paths and names
 #
-OPTEE_CLIENT_VERSION	:= 3.5.0
-OPTEE_CLIENT_MD5	:= 2738729cb2457f2b4993ef6b91a6519d
+OPTEE_CLIENT_VERSION	:= 3.6.0
+OPTEE_CLIENT_MD5	:= f8324c10e6af5408e8201032d95c303e
 OPTEE_CLIENT		:= optee-client-$(OPTEE_CLIENT_VERSION)
 OPTEE_CLIENT_SUFFIX	:= tar.gz
 OPTEE_CLIENT_URL	:= https://github.com/OP-TEE/optee_client/archive/$(OPTEE_CLIENT_VERSION).$(OPTEE_CLIENT_SUFFIX)
-- 
git-series 0.9.1

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 4/4] optee-test: version bump 3.5.0 → 3.6.0

[Rouven Czerwinski]

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
 rules/optee-test.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/optee-test.make b/rules/optee-test.make
index 488e217..b4a70e2 100644
--- a/rules/optee-test.make
+++ b/rules/optee-test.make
@@ -16,8 +16,8 @@ endif
 #
 # Paths and names
 #
-OPTEE_TEST_VERSION	:= 3.5.0
-OPTEE_TEST_MD5		:= e75893492a92ea835e8f7e22eaa9697e
+OPTEE_TEST_VERSION	:= 3.6.0
+OPTEE_TEST_MD5		:= 6ceea16d53b51efc0377b448fb0a6ec5
 OPTEE_TEST		:= optee-test-$(OPTEE_TEST_VERSION)
 OPTEE_TEST_SUFFIX	:= tar.gz
 OPTEE_TEST_URL		:= https://github.com/OP-TEE/optee_test/archive/$(OPTEE_TEST_VERSION).$(OPTEE_TEST_SUFFIX)
-- 
git-series 0.9.1

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de