[libcamera-devel] libcamera: Build IPA module signatures by default

3625 diff mbox series

Commit 7206035ee609 ("libcamera: Regenerate IPA module signatures at
install time") replaced installation of the IPA module signatures with
an install script that signs all modules. While doing so, it
inadvertently also disabled generation of the signature at build time by
default. This breaks running libcamera binaries from the build
directory. Fix it.

Fixes: 7206035ee609 ("libcamera: Regenerate IPA module signatures at install time")
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/ipa/rkisp1/meson.build | 3 ++-
 src/ipa/vimc/meson.build   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

Hi Laurent,

On 30/04/2020 02:17, Laurent Pinchart wrote:
> Commit 7206035ee609 ("libcamera: Regenerate IPA module signatures at
> install time") replaced installation of the IPA module signatures with
> an install script that signs all modules. While doing so, it
> inadvertently also disabled generation of the signature at build time by
> default. This breaks running libcamera binaries from the build
> directory. Fix it.

Argh, Is that because they only default to be built if they are going to
be installed?

Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

> Fixes: 7206035ee609 ("libcamera: Regenerate IPA module signatures at install time")
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
>  src/ipa/rkisp1/meson.build | 3 ++-
>  src/ipa/vimc/meson.build   | 3 ++-
>  2 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/src/ipa/rkisp1/meson.build b/src/ipa/rkisp1/meson.build
> index 6c6aa82f3b29..d7127ea8d1e9 100644
> --- a/src/ipa/rkisp1/meson.build
> +++ b/src/ipa/rkisp1/meson.build
> @@ -14,5 +14,6 @@ if ipa_sign_module
>                    input : mod,
>                    output : ipa_name + '.so.sign',
>                    command : [ ipa_sign, ipa_priv_key, '@INPUT@', '@OUTPUT@' ],
> -                  install : false)
> +                  install : false,
> +                  build_by_default : true)
>  endif
> diff --git a/src/ipa/vimc/meson.build b/src/ipa/vimc/meson.build
> index 253847e19d6b..22296a029642 100644
> --- a/src/ipa/vimc/meson.build
> +++ b/src/ipa/vimc/meson.build
> @@ -14,7 +14,8 @@ if ipa_sign_module
>                    input : mod,
>                    output : ipa_name + '.so.sign',
>                    command : [ ipa_sign, ipa_priv_key, '@INPUT@', '@OUTPUT@' ],
> -                  install : false)
> +                  install : false,
> +                  build_by_default : true)
>  endif
>  
>  subdir('data')
>

Hi Laurent,

Thanks for your work.

On 2020-04-30 04:17:09 +0300, Laurent Pinchart wrote:
> Commit 7206035ee609 ("libcamera: Regenerate IPA module signatures at
> install time") replaced installation of the IPA module signatures with
> an install script that signs all modules. While doing so, it
> inadvertently also disabled generation of the signature at build time by
> default. This breaks running libcamera binaries from the build
> directory. Fix it.
> 
> Fixes: 7206035ee609 ("libcamera: Regenerate IPA module signatures at install time")
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>

> ---
>  src/ipa/rkisp1/meson.build | 3 ++-
>  src/ipa/vimc/meson.build   | 3 ++-
>  2 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/src/ipa/rkisp1/meson.build b/src/ipa/rkisp1/meson.build
> index 6c6aa82f3b29..d7127ea8d1e9 100644
> --- a/src/ipa/rkisp1/meson.build
> +++ b/src/ipa/rkisp1/meson.build
> @@ -14,5 +14,6 @@ if ipa_sign_module
>                    input : mod,
>                    output : ipa_name + '.so.sign',
>                    command : [ ipa_sign, ipa_priv_key, '@INPUT@', '@OUTPUT@' ],
> -                  install : false)
> +                  install : false,
> +                  build_by_default : true)
>  endif
> diff --git a/src/ipa/vimc/meson.build b/src/ipa/vimc/meson.build
> index 253847e19d6b..22296a029642 100644
> --- a/src/ipa/vimc/meson.build
> +++ b/src/ipa/vimc/meson.build
> @@ -14,7 +14,8 @@ if ipa_sign_module
>                    input : mod,
>                    output : ipa_name + '.so.sign',
>                    command : [ ipa_sign, ipa_priv_key, '@INPUT@', '@OUTPUT@' ],
> -                  install : false)
> +                  install : false,
> +                  build_by_default : true)
>  endif
>  
>  subdir('data')
> -- 
> Regards,
> 
> Laurent Pinchart
> 
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel