Patch Detail
Show a patch.
GET /api/patches/23322/?format=api
{ "id": 23322, "url": "https://patchwork.libcamera.org/api/patches/23322/?format=api", "web_url": "https://patchwork.libcamera.org/patch/23322/", "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": "<20250430121449.39910-16-mzamazal@redhat.com>", "date": "2025-04-30T12:14:48", "name": "[v8,15/15] config: Make configuration directories configurable", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "5681aafcd6ea47493a9f4e8047c7200098c1161b", "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/23322/mbox/", "series": [ { "id": 5156, "url": "https://patchwork.libcamera.org/api/series/5156/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5156", "date": "2025-04-30T12:14:33", "name": "Add global configuration file", "version": 8, "mbox": "https://patchwork.libcamera.org/series/5156/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/23322/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/23322/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 AAA87BE08B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 30 Apr 2025 12:15:40 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 12D6668B45;\n\tWed, 30 Apr 2025 14:15:40 +0200 (CEST)", "from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.129.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F1A3168B2D\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 30 Apr 2025 14:15:36 +0200 (CEST)", "from mx-prod-mc-05.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-421-ab4FXDXOPCaHEnpEErzLHw-1;\n\tWed, 30 Apr 2025 08:15:32 -0400", "from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.111])\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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id CA7091956096; Wed, 30 Apr 2025 12:15:31 +0000 (UTC)", "from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.44.32.120])\n\tby mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 0E138180047F; Wed, 30 Apr 2025 12:15:29 +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=\"Xk8t7xBN\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1746015336;\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=cn+M7TwClTPf1UO1H4rcv+z5fIdIv4yASiLTQvTDZew=;\n\tb=Xk8t7xBNqwDh1XzZKpLCx/m8C4fBtvN/sKsmLyTtjzS4O1gbllRsxkujxSa450FdchmCkT\n\ti2UAj6PnIX8CqnCRde0JvnpC1pulomkknkGRx07a6lK+a+zL3tqnVZvPIje6lRIZZBtQTR\n\tp0C9V150Xhev4etka/A06xxrysTEtBk=", "X-MC-Unique": "ab4FXDXOPCaHEnpEErzLHw-1", "X-Mimecast-MFC-AGG-ID": "ab4FXDXOPCaHEnpEErzLHw_1746015331", "From": "Milan Zamazal <mzamazal@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Milan Zamazal <mzamazal@redhat.com>, Kieran Bingham\n\t<kieran.bingham@ideasonboard.com>, =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?=\n\t<pobrn@protonmail.com>, Laurent Pinchart\n\t<laurent.pinchart@ideasonboard.com>", "Subject": "[PATCH v8 15/15] config: Make configuration directories configurable", "Date": "Wed, 30 Apr 2025 14:14:48 +0200", "Message-ID": "<20250430121449.39910-16-mzamazal@redhat.com>", "In-Reply-To": "<20250430121449.39910-1-mzamazal@redhat.com>", "References": "<20250430121449.39910-1-mzamazal@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.4.1 on 10.30.177.111", "X-Mimecast-Spam-Score": "0", "X-Mimecast-MFC-PROC-ID": "h9kO1LZ0SuYLtsQsxzlibC1YED_oIWPiBKSScuSSIJs_1746015331", "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": "A newly introduced LIBCAMERA_CONFIG_DIR environment variable specifies a\ndirectory or a list of directories separated by colons where to look for\nthe libcamera configuration file before trying the standard locations.\n\nSigned-off-by: Milan Zamazal <mzamazal@redhat.com>\n---\n Documentation/runtime_configuration.rst | 5 +++++\n src/libcamera/base/global_configuration.cpp | 17 +++++++++++------\n 2 files changed, 16 insertions(+), 6 deletions(-)", "diff": "diff --git a/Documentation/runtime_configuration.rst b/Documentation/runtime_configuration.rst\nindex f0ad349b..19d1824f 100644\n--- a/Documentation/runtime_configuration.rst\n+++ b/Documentation/runtime_configuration.rst\n@@ -19,6 +19,11 @@ order:\n - LIBCAMERA_SYSCONF_DIR/configuration.yaml\n - /etc/libcamera/configuration.yaml\n \n+If LIBCAMERA_CONFIG_DIR environment variable is non-empty then it\n+specifies additional directories where to look for the configuration\n+file, before looking at the standard locations. It can be a single\n+directory or multiple directories separated by colons.\n+\n The default name of the configuration file, configuration.yaml, can be\n overridden in LIBCAMERA_CONFIG_NAME environment variable. The variable\n can specify just an alternative configuration file name to be looked up\ndiff --git a/src/libcamera/base/global_configuration.cpp b/src/libcamera/base/global_configuration.cpp\nindex f35b3dae..315ea7ad 100644\n--- a/src/libcamera/base/global_configuration.cpp\n+++ b/src/libcamera/base/global_configuration.cpp\n@@ -59,12 +59,6 @@ bool loadFile(const std::filesystem::path &fileName)\n \treturn true;\n }\n \n-const std::vector<std::filesystem::path>\n-\tglobalConfigurationDirectories = {\n-\t\tstd::filesystem::path(LIBCAMERA_SYSCONF_DIR),\n-\t\tstd::filesystem::path(\"/etc/libcamera\"),\n-\t};\n-\n void load()\n {\n \tconst char *libcameraConfigName =\n@@ -81,6 +75,17 @@ void load()\n \tif (configName.empty())\n \t\tconfigName = std::filesystem::path(\"configuration.yaml\");\n \n+\tconst char *const configDir = utils::secure_getenv(\"LIBCAMERA_CONFIG_DIR\");\n+\tstd::vector<std::filesystem::path> globalConfigurationDirectories;\n+\tif (configDir)\n+\t\tfor (auto const &path : utils::split(configDir, \":\"))\n+\t\t\tif (!path.empty())\n+\t\t\t\tglobalConfigurationDirectories.push_back(path);\n+\tglobalConfigurationDirectories.push_back(\n+\t\tstd::filesystem::path(LIBCAMERA_SYSCONF_DIR));\n+\tglobalConfigurationDirectories.push_back(\n+\t\tstd::filesystem::path(\"/etc/libcamera\"));\n+\n \tstd::filesystem::path userConfigurationDirectory;\n \tchar *xdgConfigHome = utils::secure_getenv(\"XDG_CONFIG_HOME\");\n \tif (xdgConfigHome) {\n", "prefixes": [ "v8", "15/15" ] }