[libcamera-devel,v2,4/4] libcamera: ipa: Move key generation to utils
diff mbox series

Message ID 20200923143949.310439-5-kieran.bingham@ideasonboard.com
State Accepted
Commit 4af45819d009bf5a0d2f61e044045c6accbb7142
Headers show
Series
  • Unify utils locations
Related show

Commit Message

Kieran Bingham Sept. 23, 2020, 2:39 p.m. UTC 
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>
---
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                           | 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%)

Patch
diff mbox series 

diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
index d63dacd55cc7..18ea3261bc15 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 db155e68e848..b9c7e7599d61 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 ef5507b1c5ca..456bf7f89f82 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')