From patchwork Wed Sep 23 14:39:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 9746 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 10A8DC3B5B for ; Wed, 23 Sep 2020 14:39:56 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 871F962FEC; Wed, 23 Sep 2020 16:39:55 +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="dPNpOjrZ"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E72AE60576 for ; Wed, 23 Sep 2020 16:39:53 +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 EDA52555; Wed, 23 Sep 2020 16:39:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1600871993; bh=6tyY/v5CJ62aqlFYgT00A2PzINcv/l1uQvqi+ZAsMhA=; h=From:To:Cc:Subject:Date:From; b=dPNpOjrZtvI9wHtUto93eoYM+UulfVP70LW5sYyshoMoqqN2KzoDsvXvfpNmTHXp1 yyHAd1EPkPAqQvW2iaAXu98Kxfb1892iuslqWlXVsWsaqw2O6NjjvxHAD0yZrsTMiJ vAMz8YoAbEI20m9jukQAuax2pow95gttTuaYn/zU= From: Kieran Bingham To: libcamera devel Date: Wed, 23 Sep 2020 15:39:45 +0100 Message-Id: <20200923143949.310439-1-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 0/4] Unify utils locations 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" Various utilities are scattered across the source trees, and are declared as GPLv2. Update the meson build to process the utils subdirectory first, giving us a location where we can define our utilities in a common location. Then move key generator scripts to the utils directory. The ipa_gen_priv_key custom target command is renamed to be in keeping with the other generator commands. The scripts which handle module signing upon installation are not handled in this series, as they currently expect to be run from their current location, and external build systems may be currently referencing from their current location too. Later work will aim to tackle the module-signing scripts, moving those will affect external users. Also of interest is the definition of the gen-version command used by the vcs_tag ... but the vcs tag function does not accept a 'files()' list as it's command parameter, so it's not (yet) suitable to move that variable declaration to utils/meson.build which had aimed to do. Kieran Bingham (4): meson: Process utils first libcamera: Move Header generation utilities to utils src: meson: Rename ipa_gen_priv_key to gen_ipa_priv_key libcamera: ipa: Move key generation to utils include/libcamera/meson.build | 6 ------ meson.build | 4 +++- src/libcamera/meson.build | 3 --- src/meson.build | 3 +-- {src/libcamera => utils}/gen-controls.py | 0 {include/libcamera => utils}/gen-formats.py | 0 {include/libcamera => utils}/gen-header.sh | 0 {src/ipa => utils}/gen-ipa-priv-key.sh | 0 {src/libcamera => utils}/gen-ipa-pub-key.py | 0 utils/meson.build | 9 +++++++++ 10 files changed, 13 insertions(+), 12 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%) rename {src/ipa => utils}/gen-ipa-priv-key.sh (100%) rename {src/libcamera => utils}/gen-ipa-pub-key.py (100%) Reviewed-by: Paul Elder