All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Cc: Etienne Carriere <etienne.carriere@linaro.org>, buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH 1/1] package/optee-client: fix build without plugins
Date: Sun, 29 May 2022 22:55:05 +0200	[thread overview]
Message-ID: <20220529205505.GE993669@scaer> (raw)
In-Reply-To: <20220517211505.7445-1-fontaine.fabrice@gmail.com>

Fabrice, All,

On 2022-05-17 23:15 +0200, Fabrice Fontaine spake thusly:
> Fix the following build failure raised since bump to version 3.17.0 in
> commit ffd45b8726d42bb299199d9f1e10ee3d3469c85a and
> https://github.com/OP-TEE/optee_client/commit/876b1ae719e12890ddd96e85cd4e9862dab46448:
> 
> /home/giuliobenetti/autobuild/run/instance-2/output-1/build/optee-client-3.17.0/tee-supplicant/src/tee_supplicant.c:104:22: error: 'TEE_PLUGIN_LOAD_PATH' undeclared here (not in a function); did you mean 'TEEC_LOAD_PATH'?
>   104 |  .plugin_load_path = TEE_PLUGIN_LOAD_PATH,
>       |                      ^~~~~~~~~~~~~~~~~~~~
>       |                      TEEC_LOAD_PATH
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/384e0ca894dbc0ec72cea76141de890f1ce484db
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  ...rc-tee_supplicant.c-fix-build-withou.patch | 39 +++++++++++++++++++
>  1 file changed, 39 insertions(+)
>  create mode 100644 package/optee-client/0001-tee-supplicant-src-tee_supplicant.c-fix-build-withou.patch
> 
> diff --git a/package/optee-client/0001-tee-supplicant-src-tee_supplicant.c-fix-build-withou.patch b/package/optee-client/0001-tee-supplicant-src-tee_supplicant.c-fix-build-withou.patch
> new file mode 100644
> index 0000000000..e41c9138ee
> --- /dev/null
> +++ b/package/optee-client/0001-tee-supplicant-src-tee_supplicant.c-fix-build-withou.patch
> @@ -0,0 +1,39 @@
> +From f2a7c942393c6383ac89d9264999cd9c93a70b80 Mon Sep 17 00:00:00 2001
> +From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +Date: Sat, 14 May 2022 19:33:57 +0200
> +Subject: [PATCH] tee-supplicant/src/tee_supplicant.c: fix build without
> + plugins
> +
> +Fix the following build failure with CFG_TEE_SUPP_PLUGINS != y raised
> +since version 3.17.0 and commit [1].
> +
> +/home/giuliobenetti/autobuild/run/instance-2/output-1/build/optee-client-3.17.0/tee-supplicant/src/tee_supplicant.c:104:22: error: 'TEE_PLUGIN_LOAD_PATH' undeclared here (not in a function); did you mean 'TEEC_LOAD_PATH'?
> +  104 |  .plugin_load_path = TEE_PLUGIN_LOAD_PATH,
> +      |                      ^~~~~~~~~~~~~~~~~~~~
> +      |                      TEEC_LOAD_PATH
> +
> +Link: [1] https://github.com/OP-TEE/optee_client/commit/876b1ae719e12890ddd96e85cd4e9862dab46448
> +Fixes: http://autobuild.buildroot.org/results/384e0ca894dbc0ec72cea76141de890f1ce484db
> +Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
> +Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +[Retrieved from:
> +https://github.com/OP-TEE/optee_client/commit/f2a7c942393c6383ac89d9264999cd9c93a70b80]
> +---
> + tee-supplicant/src/tee_supplicant.c | 2 ++
> + 1 file changed, 2 insertions(+)
> +
> +diff --git a/tee-supplicant/src/tee_supplicant.c b/tee-supplicant/src/tee_supplicant.c
> +index 7b186ed9..53c29a26 100644
> +--- a/tee-supplicant/src/tee_supplicant.c
> ++++ b/tee-supplicant/src/tee_supplicant.c
> +@@ -101,7 +101,9 @@ static struct tee_shm *shm_head;
> + 
> + struct tee_supplicant_params supplicant_params = {
> + 	.ta_dir = "optee_armtz",
> ++#ifdef TEE_PLUGIN_LOAD_PATH
> + 	.plugin_load_path = TEE_PLUGIN_LOAD_PATH,
> ++#endif
> + 	.fs_parent_path  = TEE_FS_PARENT_PATH,
> + };
> + 
> -- 
> 2.35.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

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

      reply	other threads:[~2022-05-29 20:55 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-17 21:15 [Buildroot] [PATCH 1/1] package/optee-client: fix build without plugins Fabrice Fontaine
2022-05-29 20:55 ` Yann E. MORIN [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220529205505.GE993669@scaer \
    --to=yann.morin.1998@free.fr \
    --cc=buildroot@buildroot.org \
    --cc=etienne.carriere@linaro.org \
    --cc=fontaine.fabrice@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.