diff options
author | Kieran Bingham <kieran.bingham@ideasonboard.com> | 2020-09-09 12:56:07 +0100 |
---|---|---|
committer | Kieran Bingham <kieran.bingham@ideasonboard.com> | 2020-09-24 10:56:22 +0100 |
commit | 4af45819d009bf5a0d2f61e044045c6accbb7142 (patch) | |
tree | 49f5b4efb9672d30a99fb28a35fbb158a7a5773b | |
parent | 131629d3a25f2e5879b96bdf7fa0377efdc2025b (diff) |
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 <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
-rw-r--r-- | src/libcamera/meson.build | 1 | ||||
-rw-r--r-- | src/meson.build | 1 | ||||
-rwxr-xr-x | utils/gen-ipa-priv-key.sh (renamed from src/ipa/gen-ipa-priv-key.sh) | 0 | ||||
-rwxr-xr-x | utils/gen-ipa-pub-key.py (renamed from src/libcamera/gen-ipa-pub-key.py) | 0 | ||||
-rw-r--r-- | utils/meson.build | 4 |
5 files changed, 4 insertions, 2 deletions
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 index 919751f2..919751f2 100755 --- a/src/ipa/gen-ipa-priv-key.sh +++ b/utils/gen-ipa-priv-key.sh diff --git a/src/libcamera/gen-ipa-pub-key.py b/utils/gen-ipa-pub-key.py index a4a1f7b7..a4a1f7b7 100755 --- a/src/libcamera/gen-ipa-pub-key.py +++ b/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') |