[PATCH v2] optee-client: upgrade 3.7.0 -> 3.8.0, cleanup

[PATCH v2] optee-client: upgrade 3.7.0 -> 3.8.0, cleanup

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
v2 - correct typo in the commit log - use dots in version instead of commas

 .../optee/{optee-client.bb => optee-client_git.bb}   | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)
 rename meta-arm/recipes-security/optee/{optee-client.bb => optee-client_git.bb} (63%)

diff --git a/meta-arm/recipes-security/optee/optee-client.bb b/meta-arm/recipes-security/optee/optee-client_git.bb
similarity index 63%
rename from meta-arm/recipes-security/optee/optee-client.bb
rename to meta-arm/recipes-security/optee/optee-client_git.bb
index 519683a..a25d343 100644
--- a/meta-arm/recipes-security/optee/optee-client.bb
+++ b/meta-arm/recipes-security/optee/optee-client_git.bb
@@ -1,18 +1,21 @@
-SUMMARY = "OPTEE Client"
-HOMEPAGE = "https://github.com/OP-TEE/optee_client"
+SUMMARY = "OP-TEE Client API"
+DESCRIPTION = "Open Portable Trusted Execution Environment - Normal World Client side of the TEE"
+HOMEPAGE = "https://www.op-tee.org/"
 
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=69663ab153298557a59c67a60a743e5b"
 
-PV = "3.7.0+git${SRCPV}"
+PV = "3.8.0+git${SRCPV}"
 
 inherit python3native systemd
 
-SRC_URI = "git://github.com/OP-TEE/optee_client.git \
-           file://tee-supplicant.service"
-S = "${WORKDIR}/git"
+SRCREV = "be4fa2e36f717f03ca46e574aa66f697a897d090"
+SRC_URI = " \
+    git://github.com/OP-TEE/optee_client.git \
+    file://tee-supplicant.service \
+"
 
-SRCREV = "bc0ec8ce1e4dc5ae23f4737ef659338b7cd408fe"
+S = "${WORKDIR}/git"
 
 SYSTEMD_SERVICE_${PN} = "tee-supplicant.service"
 
@@ -25,7 +28,8 @@ do_install() {
     ln -sf libteec.so.1.0 ${D}${libdir}/libteec.so
     ln -sf libteec.so.1.0 ${D}${libdir}/libteec.so.1
 
-    cp -a ${S}/out/export/usr/include ${D}/usr/
+    install -d ${D}${includedir}
+    install -p -m0644 ${S}/out/export/usr/include/*.h ${D}${includedir}
 
     sed -i -e s:/etc:${sysconfdir}:g \
            -e s:/usr/bin:${bindir}:g \
-- 
2.7.4

Re: [meta-arm] [PATCH v2] optee-client: upgrade 3.7.0 -> 3.8.0, cleanup

[Diego Sueiro]

> -----Original Message-----
> From: meta-arm@lists.yoctoproject.org <meta-arm@lists.yoctoproject.org>
> On Behalf Of Denys Dmytriyenko via lists.yoctoproject.org
> Sent: 03 April 2020 17:04
> To: meta-arm@lists.yoctoproject.org
> Cc: Denys Dmytriyenko <denys@ti.com>
> Subject: [meta-arm] [PATCH v2] optee-client: upgrade 3.7.0 -> 3.8.0, cleanup
>
> From: Denys Dmytriyenko <denys@ti.com>
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>

Reviewed-by: Diego Sueiro <diego.sueiro@arm.com>

> ---
> v2 - correct typo in the commit log - use dots in version instead of commas
>
>  .../optee/{optee-client.bb => optee-client_git.bb}   | 20 ++++++++++++--------
>  1 file changed, 12 insertions(+), 8 deletions(-)  rename meta-arm/recipes-
> security/optee/{optee-client.bb => optee-client_git.bb} (63%)
>
> diff --git a/meta-arm/recipes-security/optee/optee-client.bb b/meta-
> arm/recipes-security/optee/optee-client_git.bb
> similarity index 63%
> rename from meta-arm/recipes-security/optee/optee-client.bb
> rename to meta-arm/recipes-security/optee/optee-client_git.bb
> index 519683a..a25d343 100644
> --- a/meta-arm/recipes-security/optee/optee-client.bb
> +++ b/meta-arm/recipes-security/optee/optee-client_git.bb
> @@ -1,18 +1,21 @@
> -SUMMARY = "OPTEE Client"
> -HOMEPAGE = "https://github.com/OP-TEE/optee_client"
> +SUMMARY = "OP-TEE Client API"
> +DESCRIPTION = "Open Portable Trusted Execution Environment - Normal
> World Client side of the TEE"
> +HOMEPAGE = "https://www.op-tee.org/"
>
>  LICENSE = "BSD"
>  LIC_FILES_CHKSUM =
> "file://${S}/LICENSE;md5=69663ab153298557a59c67a60a743e5b"
>
> -PV = "3.7.0+git${SRCPV}"
> +PV = "3.8.0+git${SRCPV}"
>
>  inherit python3native systemd
>
> -SRC_URI = "git://github.com/OP-TEE/optee_client.git \
> -           file://tee-supplicant.service"
> -S = "${WORKDIR}/git"
> +SRCREV = "be4fa2e36f717f03ca46e574aa66f697a897d090"
> +SRC_URI = " \
> +    git://github.com/OP-TEE/optee_client.git \
> +    file://tee-supplicant.service \
> +"
>
> -SRCREV = "bc0ec8ce1e4dc5ae23f4737ef659338b7cd408fe"
> +S = "${WORKDIR}/git"
>
>  SYSTEMD_SERVICE_${PN} = "tee-supplicant.service"
>
> @@ -25,7 +28,8 @@ do_install() {
>      ln -sf libteec.so.1.0 ${D}${libdir}/libteec.so
>      ln -sf libteec.so.1.0 ${D}${libdir}/libteec.so.1
>
> -    cp -a ${S}/out/export/usr/include ${D}/usr/
> +    install -d ${D}${includedir}
> +    install -p -m0644 ${S}/out/export/usr/include/*.h ${D}${includedir}
>
>      sed -i -e s:/etc:${sysconfdir}:g \
>             -e s:/usr/bin:${bindir}:g \
> --
> 2.7.4

IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

Re: [meta-arm] [PATCH v2] optee-client: upgrade 3.7.0 -> 3.8.0, cleanup

[Jon Mason]

On Fri, Apr 03, 2020 at 12:03:40PM -0400, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys@ti.com>
> 
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
> v2 - correct typo in the commit log - use dots in version instead of commas

I tried to swap out this patch in the series above, but it failed to
apply cleanly.  Can you resend the entire series asa v2?

Thanks,
Jon

> 
>  .../optee/{optee-client.bb => optee-client_git.bb}   | 20 ++++++++++++--------
>  1 file changed, 12 insertions(+), 8 deletions(-)
>  rename meta-arm/recipes-security/optee/{optee-client.bb => optee-client_git.bb} (63%)
> 
> diff --git a/meta-arm/recipes-security/optee/optee-client.bb b/meta-arm/recipes-security/optee/optee-client_git.bb
> similarity index 63%
> rename from meta-arm/recipes-security/optee/optee-client.bb
> rename to meta-arm/recipes-security/optee/optee-client_git.bb
> index 519683a..a25d343 100644
> --- a/meta-arm/recipes-security/optee/optee-client.bb
> +++ b/meta-arm/recipes-security/optee/optee-client_git.bb
> @@ -1,18 +1,21 @@
> -SUMMARY = "OPTEE Client"
> -HOMEPAGE = "https://github.com/OP-TEE/optee_client"
> +SUMMARY = "OP-TEE Client API"
> +DESCRIPTION = "Open Portable Trusted Execution Environment - Normal World Client side of the TEE"
> +HOMEPAGE = "https://www.op-tee.org/"
>  
>  LICENSE = "BSD"
>  LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=69663ab153298557a59c67a60a743e5b"
>  
> -PV = "3.7.0+git${SRCPV}"
> +PV = "3.8.0+git${SRCPV}"
>  
>  inherit python3native systemd
>  
> -SRC_URI = "git://github.com/OP-TEE/optee_client.git \
> -           file://tee-supplicant.service"
> -S = "${WORKDIR}/git"
> +SRCREV = "be4fa2e36f717f03ca46e574aa66f697a897d090"
> +SRC_URI = " \
> +    git://github.com/OP-TEE/optee_client.git \
> +    file://tee-supplicant.service \
> +"
>  
> -SRCREV = "bc0ec8ce1e4dc5ae23f4737ef659338b7cd408fe"
> +S = "${WORKDIR}/git"
>  
>  SYSTEMD_SERVICE_${PN} = "tee-supplicant.service"
>  
> @@ -25,7 +28,8 @@ do_install() {
>      ln -sf libteec.so.1.0 ${D}${libdir}/libteec.so
>      ln -sf libteec.so.1.0 ${D}${libdir}/libteec.so.1
>  
> -    cp -a ${S}/out/export/usr/include ${D}/usr/
> +    install -d ${D}${includedir}
> +    install -p -m0644 ${S}/out/export/usr/include/*.h ${D}${includedir}
>  
>      sed -i -e s:/etc:${sysconfdir}:g \
>             -e s:/usr/bin:${bindir}:g \
> -- 
> 2.7.4
> 

> 

Re: [meta-arm] [PATCH v2] optee-client: upgrade 3.7.0 -> 3.8.0, cleanup

[Denys Dmytriyenko]

On Tue, Apr 07, 2020 at 11:48:23PM -0400, Jon Mason wrote:
> On Fri, Apr 03, 2020 at 12:03:40PM -0400, Denys Dmytriyenko wrote:
> > From: Denys Dmytriyenko <denys@ti.com>
> > 
> > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > ---
> > v2 - correct typo in the commit log - use dots in version instead of commas
> 
> I tried to swap out this patch in the series above, but it failed to
> apply cleanly.  Can you resend the entire series asa v2?

Done.


> Thanks,
> Jon
> 
> > 
> >  .../optee/{optee-client.bb => optee-client_git.bb}   | 20 ++++++++++++--------
> >  1 file changed, 12 insertions(+), 8 deletions(-)
> >  rename meta-arm/recipes-security/optee/{optee-client.bb => optee-client_git.bb} (63%)
> > 
> > diff --git a/meta-arm/recipes-security/optee/optee-client.bb b/meta-arm/recipes-security/optee/optee-client_git.bb
> > similarity index 63%
> > rename from meta-arm/recipes-security/optee/optee-client.bb
> > rename to meta-arm/recipes-security/optee/optee-client_git.bb
> > index 519683a..a25d343 100644
> > --- a/meta-arm/recipes-security/optee/optee-client.bb
> > +++ b/meta-arm/recipes-security/optee/optee-client_git.bb
> > @@ -1,18 +1,21 @@
> > -SUMMARY = "OPTEE Client"
> > -HOMEPAGE = "https://github.com/OP-TEE/optee_client"
> > +SUMMARY = "OP-TEE Client API"
> > +DESCRIPTION = "Open Portable Trusted Execution Environment - Normal World Client side of the TEE"
> > +HOMEPAGE = "https://www.op-tee.org/"
> >  
> >  LICENSE = "BSD"
> >  LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=69663ab153298557a59c67a60a743e5b"
> >  
> > -PV = "3.7.0+git${SRCPV}"
> > +PV = "3.8.0+git${SRCPV}"
> >  
> >  inherit python3native systemd
> >  
> > -SRC_URI = "git://github.com/OP-TEE/optee_client.git \
> > -           file://tee-supplicant.service"
> > -S = "${WORKDIR}/git"
> > +SRCREV = "be4fa2e36f717f03ca46e574aa66f697a897d090"
> > +SRC_URI = " \
> > +    git://github.com/OP-TEE/optee_client.git \
> > +    file://tee-supplicant.service \
> > +"
> >  
> > -SRCREV = "bc0ec8ce1e4dc5ae23f4737ef659338b7cd408fe"
> > +S = "${WORKDIR}/git"
> >  
> >  SYSTEMD_SERVICE_${PN} = "tee-supplicant.service"
> >  
> > @@ -25,7 +28,8 @@ do_install() {
> >      ln -sf libteec.so.1.0 ${D}${libdir}/libteec.so
> >      ln -sf libteec.so.1.0 ${D}${libdir}/libteec.so.1
> >  
> > -    cp -a ${S}/out/export/usr/include ${D}/usr/
> > +    install -d ${D}${includedir}
> > +    install -p -m0644 ${S}/out/export/usr/include/*.h ${D}${includedir}
> >  
> >      sed -i -e s:/etc:${sysconfdir}:g \
> >             -e s:/usr/bin:${bindir}:g \
> > -- 
> > 2.7.4
> > 
> 
> > 
> 

>