Patch Detail
Show a patch.
GET /api/patches/21362/?format=api
{ "id": 21362, "url": "https://patchwork.libcamera.org/api/patches/21362/?format=api", "web_url": "https://patchwork.libcamera.org/patch/21362/", "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": "<20240925095850.348259-10-mzamazal@redhat.com>", "date": "2024-09-25T09:58:41", "name": "[v4,09/15] config: Look up IPA configurables in configuration file", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "d8a212573666b75e53a0dad827b4d92a214b0342", "submitter": { "id": 177, "url": "https://patchwork.libcamera.org/api/people/177/?format=api", "name": "Milan Zamazal", "email": "mzamazal@redhat.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/21362/mbox/", "series": [ { "id": 4623, "url": "https://patchwork.libcamera.org/api/series/4623/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4623", "date": "2024-09-25T09:58:32", "name": "Add global configuration file", "version": 4, "mbox": "https://patchwork.libcamera.org/series/4623/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/21362/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/21362/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 68927C0F1B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 25 Sep 2024 09:59:36 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0BD8A63521;\n\tWed, 25 Sep 2024 11:59:36 +0200 (CEST)", "from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.133.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5518C63511\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 25 Sep 2024 11:59:27 +0200 (CEST)", "from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-528-BWROabD6Pd2pmjdMVJYDGw-1;\n\tWed, 25 Sep 2024 05:59:23 -0400", "from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (unknown\n\t[10.30.177.12])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\tkey-exchange X25519 server-signature RSA-PSS (2048 bits)\n\tserver-digest SHA256) (No client certificate requested)\n\tby mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id E39B21955D58; Wed, 25 Sep 2024 09:59:21 +0000 (UTC)", "from nuthatch.redhat.com (unknown [10.45.225.29])\n\tby mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 7535019560AA; Wed, 25 Sep 2024 09:59:20 +0000 (UTC)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"IEbgXKEL\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1727258366;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\tcontent-transfer-encoding:content-transfer-encoding:\n\tin-reply-to:in-reply-to:references:references;\n\tbh=IE5pj4rhqlyzdqhFHOEf0L65KTuS1mmhXcH3WPPTCmo=;\n\tb=IEbgXKELjp3pkJPOX3vt9i57KqXIJ5I+gLc5K66jZZRvVHW6qXpcX+6frIl0vJuYAZqtuw\n\t4gTjQ/hK087xuDG7RHFOMjqQl2i3fnSkfTkWUxqykJODqY2P/AFL0lTXKUIDk4LCRYQr81\n\tEBhOdAN25uU9cUhnHS8gxzUzF/jUa48=", "X-MC-Unique": "BWROabD6Pd2pmjdMVJYDGw-1", "From": "Milan Zamazal <mzamazal@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Milan Zamazal <mzamazal@redhat.com>,\n\tKieran Bingham <kieran.bingham@ideasonboard.com>,\n\tNaushir Patuck <naush@raspberrypi.com>", "Subject": "[PATCH v4 09/15] config: Look up IPA configurables in configuration\n\tfile", "Date": "Wed, 25 Sep 2024 11:58:41 +0200", "Message-ID": "<20240925095850.348259-10-mzamazal@redhat.com>", "In-Reply-To": "<20240925095850.348259-1-mzamazal@redhat.com>", "References": "<20240925095850.348259-1-mzamazal@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.0 on 10.30.177.12", "X-Mimecast-Spam-Score": "0", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain; charset=\"US-ASCII\"; x-default=true", "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>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "The configuration snippet:\n\n configuration:\n ipa:\n config_paths: CONFIG:PATHS:...\n module_paths: MODULE:PATHS:...\n force_isolation: BOOL\n\nSigned-off-by: Milan Zamazal <mzamazal@redhat.com>\n---\n src/libcamera/ipa_manager.cpp | 11 ++++++++---\n src/libcamera/ipa_proxy.cpp | 16 +++++++++++-----\n 2 files changed, 19 insertions(+), 8 deletions(-)", "diff": "diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp\nindex 28384844a..573e39b82 100644\n--- a/src/libcamera/ipa_manager.cpp\n+++ b/src/libcamera/ipa_manager.cpp\n@@ -123,8 +123,11 @@ IPAManager::IPAManager()\n \tunsigned int ipaCount = 0;\n \n \t/* User-specified paths take precedence. */\n-\tconst char *modulePaths = utils::secure_getenv(\"LIBCAMERA_IPA_MODULE_PATH\");\n-\tif (modulePaths) {\n+\tconst auto confModulePaths =\n+\t\tGlobalConfiguration::envOption(\n+\t\t\t\"LIBCAMERA_IPA_MODULE_PATH\", \"ipa.module_paths\");\n+\tif (confModulePaths.has_value()) {\n+\t\tconst char *modulePaths = confModulePaths.value().c_str();\n \t\tfor (const auto &dir : utils::split(modulePaths, \":\")) {\n \t\t\tif (dir.empty())\n \t\t\t\tcontinue;\n@@ -298,7 +301,9 @@ bool IPAManager::isSignatureValid([[maybe_unused]] IPAModule *ipa) const\n {\n #if HAVE_IPA_PUBKEY\n \tchar *force = utils::secure_getenv(\"LIBCAMERA_IPA_FORCE_ISOLATION\");\n-\tif (force && force[0] != '\\0') {\n+\tif ((force && force[0] != '\\0') ||\n+\t (!force && GlobalConfiguration::option<bool>(\"ipa.force_isolation\")\n+\t\t\t .value_or(false))) {\n \t\tLOG(IPAManager, Debug)\n \t\t\t<< \"Isolation of IPA module \" << ipa->path()\n \t\t\t<< \" forced through environment variable\";\ndiff --git a/src/libcamera/ipa_proxy.cpp b/src/libcamera/ipa_proxy.cpp\nindex 85004737c..787d58019 100644\n--- a/src/libcamera/ipa_proxy.cpp\n+++ b/src/libcamera/ipa_proxy.cpp\n@@ -14,6 +14,7 @@\n #include <libcamera/base/log.h>\n #include <libcamera/base/utils.h>\n \n+#include \"libcamera/internal/global_configuration.h\"\n #include \"libcamera/internal/ipa_module.h\"\n \n /**\n@@ -108,8 +109,11 @@ std::string IPAProxy::configurationFile(const std::string &name,\n \tstd::string ipaName = ipam_->info().name;\n \n \t/* Check the environment variable first. */\n-\tconst char *confPaths = utils::secure_getenv(\"LIBCAMERA_IPA_CONFIG_PATH\");\n-\tif (confPaths) {\n+\tauto confConfPaths =\n+\t\tGlobalConfiguration::envOption(\n+\t\t\t\"LIBCAMERA_IPA_CONFIG_PATH\", \"ipa.config_paths\");\n+\tif (confConfPaths.has_value()) {\n+\t\tconst char *confPaths = confConfPaths.value().c_str();\n \t\tfor (const auto &dir : utils::split(confPaths, \":\")) {\n \t\t\tif (dir.empty())\n \t\t\t\tcontinue;\n@@ -183,9 +187,11 @@ std::string IPAProxy::resolvePath(const std::string &file) const\n \tstd::string proxyFile = \"/\" + file;\n \n \t/* Check env variable first. */\n-\tconst char *execPaths = utils::secure_getenv(\"LIBCAMERA_IPA_PROXY_PATH\");\n-\tif (execPaths) {\n-\t\tfor (const auto &dir : utils::split(execPaths, \":\")) {\n+\tconst auto execPaths =\n+\t\tGlobalConfiguration::envOption(\n+\t\t\t\"LIBCAMERA_IPA_PROXY_PATH\", \"ipa.proxy_paths\");\n+\tif (execPaths.has_value()) {\n+\t\tfor (const auto &dir : utils::split(execPaths.value().c_str(), \":\")) {\n \t\t\tif (dir.empty())\n \t\t\t\tcontinue;\n \n", "prefixes": [ "v4", "09/15" ] }