From 4af45819d009bf5a0d2f61e044045c6accbb7142 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Wed, 9 Sep 2020 12:56:07 +0100 Subject: [PATCH] libcamera: ipa: Move key generation to utils Move the GPLv2 utilities used for generating public and private keys to the utilities subtree. Signed-off-by: Kieran Bingham Reviewed-by: Laurent Pinchart Reviewed-by: Paul Elder --- 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 | 4 ++++ 5 files changed, 4 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 d63dacd5..18ea3261 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 db155e68..b9c7e759 100644 --- a/src/meson.build +++ b/src/meson.build @@ -4,7 +4,6 @@ subdir('android') openssl = find_program('openssl', required : true) if openssl.found() - gen_ipa_priv_key = files('ipa/gen-ipa-priv-key.sh') ipa_priv_key = custom_target('ipa-priv-key', output : [ 'ipa-priv-key.pem' ], command : [ gen_ipa_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 ef5507b1..456bf7f8 100644 --- a/utils/meson.build +++ b/utils/meson.build @@ -6,3 +6,7 @@ subdir('ipu3') 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')