From patchwork Wed Sep 9 13:05:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 9552 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 88BB0BDB1D for ; Wed, 9 Sep 2020 13:06:07 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id D9B2F60534; Wed, 9 Sep 2020 15:06:06 +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="gnZ1lj1P"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 8E25D62B90 for ; Wed, 9 Sep 2020 15:06:04 +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 1A2C059E; Wed, 9 Sep 2020 15:06:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1599656764; bh=CnhCl67iaij7ShyBrCUOnlCkMrdTiTQVgagh6NPXhyE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gnZ1lj1PBo+0ipnq9Lmxq+gKNf5JCP/tVumk9YGg7dPbVyspbc2aYbMQdnR4GSAUK D+dQ/6Ii0RmjJwBtdl+rcrB0NhRvLhGUVJ63IYbbo3jb9Dcqw0OSZkfBCpmk2GIXuy 4Kxob0fK75adLOEWskoxbXJkxVQLEVev928h36D8= From: Kieran Bingham To: libcamera devel Date: Wed, 9 Sep 2020 14:05:57 +0100 Message-Id: <20200909130559.1122914-2-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200909130559.1122914-1-kieran.bingham@ideasonboard.com> References: <20200909130559.1122914-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/3] meson: Process utils first 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" The utils directory can contain helpers and support tools which are used throughout other components of the build. Ensure that the utils subdir is parsed first allowing helpers to be defined there. Signed-off-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 1ea35e92ed67..510a6d3b44e6 100644 --- a/meson.build +++ b/meson.build @@ -100,9 +100,11 @@ add_project_link_arguments(cpp_arguments, language : 'cpp') libcamera_includes = include_directories('include') +# Utilities are parsed first to provide support for other components. +subdir('utils') + subdir('include') subdir('src') -subdir('utils') # The documentation and test components are optional and can be disabled # through configuration values. They are enabled by default. From patchwork Wed Sep 9 13:05:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 9553 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 4290FBDB1D for ; Wed, 9 Sep 2020 13:06:08 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 323AF62D43; Wed, 9 Sep 2020 15:06:07 +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="e5MZT47g"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id CAF5462B90 for ; Wed, 9 Sep 2020 15:06:04 +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 6BAA19DF; Wed, 9 Sep 2020 15:06:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1599656764; bh=zD//Ihx1P8BtLeBv2L6EeYx2tMDTcKpdqKdLslwYK0k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e5MZT47gdFuvdqIsSPv8as4C48BRHo7fKqR2rCbsCJJjHm91T/J+qaG6DnMtdwjOl 4Ba0iavTDtXms5WdQ5McCM9ndaKSVUYdA7D8Rvjxg8uEyDnom0DtMzhM7KMW+07p9j 8r5fo2vbSrSMuwO0sd0Nih34SCxi94gH1Pcog7JI= From: Kieran Bingham To: libcamera devel Date: Wed, 9 Sep 2020 14:05:58 +0100 Message-Id: <20200909130559.1122914-3-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200909130559.1122914-1-kieran.bingham@ideasonboard.com> References: <20200909130559.1122914-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/3] libcamera: Move Header generation utilities 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 GPL2 utilities which handle generation of controls, formats and the top level libcamera header to the utils subtree. Signed-off-by: Kieran Bingham Move the GPL2 utility library out of the libcamera source directory and into the utils subdirectory. Reviewed-by: Laurent Pinchart --- include/libcamera/meson.build | 6 ------ src/libcamera/meson.build | 2 -- {src/libcamera => utils}/gen-controls.py | 0 {include/libcamera => utils}/gen-formats.py | 0 {include/libcamera => utils}/gen-header.sh | 0 utils/meson.build | 9 +++++++++ 6 files changed, 9 insertions(+), 8 deletions(-) rename {src/libcamera => utils}/gen-controls.py (100%) rename {include/libcamera => utils}/gen-formats.py (100%) rename {include/libcamera => utils}/gen-header.sh (100%) diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build index cdb8e0372e77..692931a5a639 100644 --- a/include/libcamera/meson.build +++ b/include/libcamera/meson.build @@ -34,8 +34,6 @@ install_headers(libcamera_public_headers, # # control_ids.h and property_ids.h -gen_controls = files('../../src/libcamera/gen-controls.py') - control_source_files = [ 'control_ids', 'property_ids', @@ -57,8 +55,6 @@ endforeach libcamera_public_headers += control_headers # formats.h -gen_formats = files('gen-formats.py') - formats_h = custom_target('formats_h', input : files( '../../src/libcamera/formats.yaml', @@ -72,8 +68,6 @@ formats_h = custom_target('formats_h', libcamera_public_headers += formats_h # libcamera.h -gen_header = files('gen-header.sh') - libcamera_h = custom_target('gen-header', input : 'meson.build', output : 'libcamera.h', diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index af2f3d950be6..d54ee979418b 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -77,8 +77,6 @@ if libudev.found() ]) endif -gen_controls = files('gen-controls.py') - control_sources = [] foreach source : control_source_files diff --git a/src/libcamera/gen-controls.py b/utils/gen-controls.py similarity index 100% rename from src/libcamera/gen-controls.py rename to utils/gen-controls.py diff --git a/include/libcamera/gen-formats.py b/utils/gen-formats.py similarity index 100% rename from include/libcamera/gen-formats.py rename to utils/gen-formats.py diff --git a/include/libcamera/gen-header.sh b/utils/gen-header.sh similarity index 100% rename from include/libcamera/gen-header.sh rename to utils/gen-header.sh diff --git a/utils/meson.build b/utils/meson.build index c3cd9d69f887..7689790eb1c1 100644 --- a/utils/meson.build +++ b/utils/meson.build @@ -1,3 +1,12 @@ # SPDX-License-Identifier: CC0-1.0 subdir('ipu3') + +## Generates control_ids.h and property_ids.h +gen_controls = files('gen-controls.py') + +## Generates formats.h +gen_formats = files('gen-formats.py') + +## Generates libcamera.h +gen_header = files('gen-header.sh') From patchwork Wed Sep 9 13:05:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 9554 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 7FFB2BDB1E for ; Wed, 9 Sep 2020 13:06:08 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 7B7CF62D53; Wed, 9 Sep 2020 15:06:07 +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="JXDI+IMV"; 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 2A13462B90 for ; Wed, 9 Sep 2020 15:06:05 +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 BC3EBA15; Wed, 9 Sep 2020 15:06:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1599656764; bh=cptv2qY2C+utz9f8wPg1t7W9f4Gv4rFCv9s0RZMXoWE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JXDI+IMVPhZxoYTtvmavO6wNJi3jYkcXhfNO8UDoiv3wt6u2QM9XzgmW+i6gi0/H1 BWOCaU+AamYQXN9ofOh+LWQOh2zfPkV32aHbqRGOLu5ShRSP6/q1c4l63PzLEQsUgv yI3cWSeczsbunVyfqAe3YbhA5aAPN5nR701ZZVAk= From: Kieran Bingham To: libcamera devel Date: Wed, 9 Sep 2020 14:05:59 +0100 Message-Id: <20200909130559.1122914-4-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200909130559.1122914-1-kieran.bingham@ideasonboard.com> References: <20200909130559.1122914-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 3/3] 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 | 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') + +## Generates ipa_pub_key.cpp +gen_ipa_pub_key = files('gen-ipa-pub-key.py')