From patchwork Wed Sep 23 14:39:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 9750 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id D5F38C3B5B for ; Wed, 23 Sep 2020 14:39:59 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id A1B6360576; Wed, 23 Sep 2020 16:39:59 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="D3ybd8ea"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 1907962FD2 for ; Wed, 23 Sep 2020 16:39:55 +0200 (CEST) Received: from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id A124C1243; Wed, 23 Sep 2020 16:39:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1600871994; bh=2qopBN6t9zjfnRYk78W8H/eApeiVo7i3/d03ZRJhrcM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D3ybd8eaDA56JBla9/ywCdVNnuySb8EkPpg0ysau5cT7lg895sOuoWRHJKV+/f88O psm087iXkRs10jVLTXCVjBrh7R/GdAjZcntaWTNRJKGfGRjOUIoT8rQ/ZB+ofuvX1O bQxRs+FP8jhyb5bdKX4p9RyCvYt6Xx318uL8RNFU= From: Kieran Bingham To: libcamera devel Date: Wed, 23 Sep 2020 15:39:49 +0100 Message-Id: <20200923143949.310439-5-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200923143949.310439-1-kieran.bingham@ideasonboard.com> References: <20200923143949.310439-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 4/4] libcamera: ipa: Move key generation to utils X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Move the GPLv2 utilities used for generating public and private keys to the utilities subtree. Signed-off-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- 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%) 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')