[libcamera-devel,3/3] libcamera: ipa: Move key generation to utils

9554 diff mbox series

Move the GPLv2 utilities used for generating public and private keys to
the utilities subtree.

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

---
The ipa-sign and installation scripts are more complex to move and can
be handled separately if this series is deemed worthwhile.
---
 src/libcamera/meson.build                   | 1 -
 src/meson.build                             | 1 -
 {src/ipa => utils}/gen-ipa-priv-key.sh      | 0
 {src/libcamera => utils}/gen-ipa-pub-key.py | 0
 utils/meson.build                           | 6 ++++++
 5 files changed, 6 insertions(+), 2 deletions(-)
 rename {src/ipa => utils}/gen-ipa-priv-key.sh (100%)
 rename {src/libcamera => utils}/gen-ipa-pub-key.py (100%)

Hi Kieran,

Thank you for the patch.

On Wed, Sep 09, 2020 at 02:05:59PM +0100, Kieran Bingham wrote:
> Move the GPLv2 utilities used for generating public and private keys to
> the utilities subtree.
> 
> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
> 
> ---
> The ipa-sign and installation scripts are more complex to move and can
> be handled separately if this series is deemed worthwhile.
> ---
>  src/libcamera/meson.build                   | 1 -
>  src/meson.build                             | 1 -
>  {src/ipa => utils}/gen-ipa-priv-key.sh      | 0
>  {src/libcamera => utils}/gen-ipa-pub-key.py | 0
>  utils/meson.build                           | 6 ++++++
>  5 files changed, 6 insertions(+), 2 deletions(-)
>  rename {src/ipa => utils}/gen-ipa-priv-key.sh (100%)
>  rename {src/libcamera => utils}/gen-ipa-pub-key.py (100%)
> 
> diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
> index d54ee979418b..61bed7f64e7e 100644
> --- a/src/libcamera/meson.build
> +++ b/src/libcamera/meson.build
> @@ -100,7 +100,6 @@ version_cpp = vcs_tag(command : [gen_version, meson.build_root()],
>  libcamera_sources += version_cpp
>  
>  if ipa_sign_module
> -    gen_ipa_pub_key = files('gen-ipa-pub-key.py')
>      ipa_pub_key_cpp = custom_target('ipa_pub_key_cpp',
>                                      input : [ ipa_priv_key, 'ipa_pub_key.cpp.in' ],
>                                      output : 'ipa_pub_key.cpp',
> diff --git a/src/meson.build b/src/meson.build
> index d69b4c1ea978..2ed4fb640284 100644
> --- a/src/meson.build
> +++ b/src/meson.build
> @@ -6,7 +6,6 @@ endif
>  
>  openssl = find_program('openssl', required : true)
>  if openssl.found()
> -    ipa_gen_priv_key = files('ipa/gen-ipa-priv-key.sh')
>      ipa_priv_key = custom_target('ipa-priv-key',
>                                   output : [ 'ipa-priv-key.pem' ],
>                                   command : [ ipa_gen_priv_key, '@OUTPUT@' ])
> diff --git a/src/ipa/gen-ipa-priv-key.sh b/utils/gen-ipa-priv-key.sh
> similarity index 100%
> rename from src/ipa/gen-ipa-priv-key.sh
> rename to utils/gen-ipa-priv-key.sh
> diff --git a/src/libcamera/gen-ipa-pub-key.py b/utils/gen-ipa-pub-key.py
> similarity index 100%
> rename from src/libcamera/gen-ipa-pub-key.py
> rename to utils/gen-ipa-pub-key.py
> diff --git a/utils/meson.build b/utils/meson.build
> index 7689790eb1c1..a069e1ca9f79 100644
> --- a/utils/meson.build
> +++ b/utils/meson.build
> @@ -10,3 +10,9 @@ gen_formats = files('gen-formats.py')
>  
>  ## Generates libcamera.h
>  gen_header = files('gen-header.sh')
> +
> +## Generates ipa-priv-key.pem
> +ipa_gen_priv_key = files('gen-ipa-priv-key.sh')

While at it, I would s/ipa_gen_priv_key/gen_ipa_priv_key/.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> +
> +## Generates ipa_pub_key.cpp
> +gen_ipa_pub_key = files('gen-ipa-pub-key.py')

Hi Laurent,

On 10/09/2020 05:41, Laurent Pinchart wrote:
> Hi Kieran,
> 
> Thank you for the patch.
> 
> On Wed, Sep 09, 2020 at 02:05:59PM +0100, Kieran Bingham wrote:
>> Move the GPLv2 utilities used for generating public and private keys to
>> the utilities subtree.
>>
>> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
>>
>> ---
>> The ipa-sign and installation scripts are more complex to move and can
>> be handled separately if this series is deemed worthwhile.
>> ---
>>  src/libcamera/meson.build                   | 1 -
>>  src/meson.build                             | 1 -
>>  {src/ipa => utils}/gen-ipa-priv-key.sh      | 0
>>  {src/libcamera => utils}/gen-ipa-pub-key.py | 0
>>  utils/meson.build                           | 6 ++++++
>>  5 files changed, 6 insertions(+), 2 deletions(-)
>>  rename {src/ipa => utils}/gen-ipa-priv-key.sh (100%)
>>  rename {src/libcamera => utils}/gen-ipa-pub-key.py (100%)
>>
>> diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
>> index d54ee979418b..61bed7f64e7e 100644
>> --- a/src/libcamera/meson.build
>> +++ b/src/libcamera/meson.build
>> @@ -100,7 +100,6 @@ version_cpp = vcs_tag(command : [gen_version, meson.build_root()],
>>  libcamera_sources += version_cpp
>>  
>>  if ipa_sign_module
>> -    gen_ipa_pub_key = files('gen-ipa-pub-key.py')
>>      ipa_pub_key_cpp = custom_target('ipa_pub_key_cpp',
>>                                      input : [ ipa_priv_key, 'ipa_pub_key.cpp.in' ],
>>                                      output : 'ipa_pub_key.cpp',
>> diff --git a/src/meson.build b/src/meson.build
>> index d69b4c1ea978..2ed4fb640284 100644
>> --- a/src/meson.build
>> +++ b/src/meson.build
>> @@ -6,7 +6,6 @@ endif
>>  
>>  openssl = find_program('openssl', required : true)
>>  if openssl.found()
>> -    ipa_gen_priv_key = files('ipa/gen-ipa-priv-key.sh')
>>      ipa_priv_key = custom_target('ipa-priv-key',
>>                                   output : [ 'ipa-priv-key.pem' ],
>>                                   command : [ ipa_gen_priv_key, '@OUTPUT@' ])
>> diff --git a/src/ipa/gen-ipa-priv-key.sh b/utils/gen-ipa-priv-key.sh
>> similarity index 100%
>> rename from src/ipa/gen-ipa-priv-key.sh
>> rename to utils/gen-ipa-priv-key.sh
>> diff --git a/src/libcamera/gen-ipa-pub-key.py b/utils/gen-ipa-pub-key.py
>> similarity index 100%
>> rename from src/libcamera/gen-ipa-pub-key.py
>> rename to utils/gen-ipa-pub-key.py
>> diff --git a/utils/meson.build b/utils/meson.build
>> index 7689790eb1c1..a069e1ca9f79 100644
>> --- a/utils/meson.build
>> +++ b/utils/meson.build
>> @@ -10,3 +10,9 @@ gen_formats = files('gen-formats.py')
>>  
>>  ## Generates libcamera.h
>>  gen_header = files('gen-header.sh')
>> +
>> +## Generates ipa-priv-key.pem
>> +ipa_gen_priv_key = files('gen-ipa-priv-key.sh')
> 
> While at it, I would s/ipa_gen_priv_key/gen_ipa_priv_key/.

Good point. I recall thinking that when I saw it - but haven't acted
upon it.

I'll also group these additions in the same fashion as the preceeding patch:

## Code generation
gen_controls = files('gen-controls.py')
gen_formats = files('gen-formats.py')
gen_header = files('gen-header.sh')

## Module signing
gen_ipa_priv_key = files('gen-ipa-priv-key.sh')
gen_ipa_pub_key = files('gen-ipa-pub-key.py')


> 
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> 

Thanks

>> +
>> +## Generates ipa_pub_key.cpp
>> +gen_ipa_pub_key = files('gen-ipa-pub-key.py')
>