Patch Detail
Show a patch.
GET /api/patches/10595/?format=api
{ "id": 10595, "url": "https://patchwork.libcamera.org/api/patches/10595/?format=api", "web_url": "https://patchwork.libcamera.org/patch/10595/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20201207150737.307692-4-kieran.bingham@ideasonboard.com>", "date": "2020-12-07T15:07:36", "name": "[libcamera-devel,3/4] src: meson: Define system paths", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "32135df9deb95ef56c292892ba2a6f31f5dd3e2c", "submitter": { "id": 4, "url": "https://patchwork.libcamera.org/api/people/4/?format=api", "name": "Kieran Bingham", "email": "kieran.bingham@ideasonboard.com" }, "delegate": { "id": 11, "url": "https://patchwork.libcamera.org/api/users/11/?format=api", "username": "kbingham", "first_name": "Kieran", "last_name": "Bingham", "email": "kieran.bingham@ideasonboard.com" }, "mbox": "https://patchwork.libcamera.org/patch/10595/mbox/", "series": [ { "id": 1510, "url": "https://patchwork.libcamera.org/api/series/1510/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1510", "date": "2020-12-07T15:07:33", "name": "libcamera: Small meson-fixes", "version": 1, "mbox": "https://patchwork.libcamera.org/series/1510/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/10595/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/10595/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "X-Original-To": "parsemail@patchwork.libcamera.org", "Delivered-To": "parsemail@patchwork.libcamera.org", "Received": [ "from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id A1AB6BDB20\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 7 Dec 2020 15:07:47 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 414B567E5C;\n\tMon, 7 Dec 2020 16:07:47 +0100 (CET)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6310367E54\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 7 Dec 2020 16:07:44 +0100 (CET)", "from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net\n\t[86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id EA28251D;\n\tMon, 7 Dec 2020 16:07:43 +0100 (CET)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"ZRn1gcAR\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1607353664;\n\tbh=w3O6CVuRXkCi/9rd/xWHEbPF04ui1FHtqu3KS2i1iBg=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=ZRn1gcARUrIbbj0/KcB2P145/BUc24uFa8mTd4/wc+2s9LH/qLr7M8PQfdz2tO00v\n\tMDff5xwZEBls2jfFSAUAZD5rFyWYTqVLJSmqDzxd+ljttBczRRknZudtOsYe2yU2C7\n\txc4BsEGm6PtBAErFWGuv3TSs65FqjKg5r52QkgcI=", "From": "Kieran Bingham <kieran.bingham@ideasonboard.com>", "To": "libcamera devel <libcamera-devel@lists.libcamera.org>", "Date": "Mon, 7 Dec 2020 15:07:36 +0000", "Message-Id": "<20201207150737.307692-4-kieran.bingham@ideasonboard.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20201207150737.307692-1-kieran.bingham@ideasonboard.com>", "References": "<20201207150737.307692-1-kieran.bingham@ideasonboard.com>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH 3/4] src: meson: Define system paths", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Define libcamera specific system paths for use within the library code\nbase. These can be used to identify system configuration files and\nshared data.\n\nAlso, make use of the new system path variables and map the ipa paths\nupon the libcamera system path, making use of the new shorter syntax for\njoin_paths().\n\nSigned-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\n---\nv2:\n - Add comments explaining why we can't use prefix throughout\n - Squash src/meson and src/ipa/meson changes together\n\n src/ipa/meson.build | 19 ++++++++++---------\n src/meson.build | 14 ++++++++++++++\n 2 files changed, 24 insertions(+), 9 deletions(-)", "diff": "diff --git a/src/ipa/meson.build b/src/ipa/meson.build\nindex 5a5de267c147..41625ed471bc 100644\n--- a/src/ipa/meson.build\n+++ b/src/ipa/meson.build\n@@ -1,19 +1,17 @@\n # SPDX-License-Identifier: CC0-1.0\n \n-ipa_install_dir = join_paths(get_option('libdir'), 'libcamera')\n-ipa_data_dir = join_paths(get_option('datadir'), 'libcamera', 'ipa')\n-ipa_sysconf_dir = join_paths(get_option('sysconfdir'), 'libcamera', 'ipa')\n-\n ipa_includes = [\n libcamera_includes,\n ]\n \n-config_h.set('IPA_CONFIG_DIR',\n- '\"' + join_paths(get_option('prefix'), ipa_sysconf_dir) +\n- ':' + join_paths(get_option('prefix'), ipa_data_dir) + '\"')\n+ipa_install_dir = libcamera_libdir\n+ipa_data_dir = libcamera_datadir / 'ipa'\n+ipa_sysconf_dir = libcamera_sysconfdir / 'ipa'\n+\n+config_h.set('IPA_CONFIG_DIR', '\"' + prefix / ipa_sysconf_dir +\n+ ':' + prefix / ipa_data_dir + '\"')\n \n-config_h.set('IPA_MODULE_DIR',\n- '\"' + join_paths(get_option('prefix'), ipa_install_dir) + '\"')\n+config_h.set('IPA_MODULE_DIR', '\"' + prefix / ipa_install_dir + '\"')\n \n subdir('libipa')\n \n@@ -22,6 +20,9 @@ ipa_sign = files('ipa-sign.sh')\n ipas = ['raspberrypi', 'rkisp1', 'vimc']\n ipa_names = []\n \n+# The ipa-sign-install.sh script which uses the ipa_names variable will itself\n+# prepend MESON_INSTALL_DESTDIR_PREFIX to each ipa module name, therefore we\n+# must not include the prefix string here.\n foreach pipeline : get_option('pipelines')\n if ipas.contains(pipeline)\n subdir(pipeline)\ndiff --git a/src/meson.build b/src/meson.build\nindex 4b75f05878bc..f98fcede203b 100644\n--- a/src/meson.build\n+++ b/src/meson.build\n@@ -1,5 +1,19 @@\n # SPDX-License-Identifier: CC0-1.0\n \n+# Handle system paths\n+datadir = get_option('datadir')\n+libdir = get_option('libdir')\n+prefix = get_option('prefix')\n+sysconfdir = get_option('sysconfdir')\n+\n+libcamera_datadir = datadir / 'libcamera'\n+libcamera_libdir = libdir / 'libcamera'\n+libcamera_sysconfdir = sysconfdir / 'libcamera'\n+\n+config_h.set('LIBCAMERA_DATA_DIR', '\"' + prefix / libcamera_datadir + '\"')\n+config_h.set('LIBCAMERA_SYSCONF_DIR', '\"' + prefix / libcamera_sysconfdir + '\"')\n+\n+# Module Signing\n openssl = find_program('openssl', required : true)\n if openssl.found()\n ipa_priv_key = custom_target('ipa-priv-key',\n", "prefixes": [ "libcamera-devel", "3/4" ] }