{"id":22253,"url":"https://patchwork.libcamera.org/api/patches/22253/?format=json","web_url":"https://patchwork.libcamera.org/patch/22253/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20241206171148.1189292-17-mzamazal@redhat.com>","date":"2024-12-06T17:11:47","name":"[v6,16/16] 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=json","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/22253/mbox/","series":[{"id":4861,"url":"https://patchwork.libcamera.org/api/series/4861/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4861","date":"2024-12-06T17:11:31","name":"Add global configuration file","version":6,"mbox":"https://patchwork.libcamera.org/series/4861/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/22253/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22253/checks/","tags":{},"headers":{"Return-Path":"","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 E9FE8BF415\n\tfor ;\n\tFri, 6 Dec 2024 17:12:59 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9D5C967E5F;\n\tFri, 6 Dec 2024 18:12:59 +0100 (CET)","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 B56A067E59\n\tfor ;\n\tFri, 6 Dec 2024 18:12:57 +0100 (CET)","from mx-prod-mc-02.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-633-9vN6BmUgMc6LIT74eSi4iw-1;\n\tFri, 06 Dec 2024 12:12:52 -0500","from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4])\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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id C01101956055; Fri, 6 Dec 2024 17:12:50 +0000 (UTC)","from nuthatch.redhat.com (unknown [10.45.224.27])\n\tby mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 39484300019E; Fri, 6 Dec 2024 17:12:47 +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=\"Xv1uY6ZV\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1733505176;\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=K+RdvnxY9IIThPLu5rDGMot90CrGupAyqZMph+CFr5w=;\n\tb=Xv1uY6ZVUnL5cJDfei2eiwXKbIipZpWkQYB5jch0rThdCuclYGA0OOCLEWHakYoWyHx1GN\n\tTTQDL4KfORp2hVHO4cajY1UcFsTH3KmNYcwLhRo8Kc4xqAW5K+B653xigkuQlQq019b8Ij\n\tL24bqZrKkMYPX4v0AMdGmM5nDokGoHE=","X-MC-Unique":"9vN6BmUgMc6LIT74eSi4iw-1","X-Mimecast-MFC-AGG-ID":"9vN6BmUgMc6LIT74eSi4iw","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal , Kieran Bingham\n\t, Naushir Patuck\n\t, =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?=\n\t, Laurent Pinchart\n\t","Subject":"[PATCH v6 16/16] config: Make configuration directories configurable","Date":"Fri, 6 Dec 2024 18:11:47 +0100","Message-ID":"<20241206171148.1189292-17-mzamazal@redhat.com>","In-Reply-To":"<20241206171148.1189292-1-mzamazal@redhat.com>","References":"<20241206171148.1189292-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.4.1 on 10.30.177.4","X-Mimecast-Spam-Score":"0","X-Mimecast-MFC-PROC-ID":"6I0Y4JTnDGn7LakNfsLRlaw8GFTfOq01Owyakscr1NY_1733505170","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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"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 \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 59211169..c73d02e3 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\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 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":["v6","16/16"]}