{"id":24362,"url":"https://patchwork.libcamera.org/api/patches/24362/?format=json","web_url":"https://patchwork.libcamera.org/patch/24362/","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":"<20250912142915.53949-13-mzamazal@redhat.com>","date":"2025-09-12T14:29:13","name":"[v18,11/12] config: Make configuration file locations configurable","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"fac24f4bc07c52054f1b659275f6ff6720bedf2f","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/24362/mbox/","series":[{"id":5441,"url":"https://patchwork.libcamera.org/api/series/5441/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5441","date":"2025-09-12T14:29:01","name":"Add global configuration file","version":18,"mbox":"https://patchwork.libcamera.org/series/5441/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/24362/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/24362/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 26BCEC328C\n\tfor ;\n\tFri, 12 Sep 2025 14:30:06 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B464D6937D;\n\tFri, 12 Sep 2025 16:30:05 +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 68B1C6937D\n\tfor ;\n\tFri, 12 Sep 2025 16:30:03 +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-398-Qq0lNngUM7GHy7STShbVUw-1;\n\tFri, 12 Sep 2025 10:29:59 -0400","from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.93])\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 C9D861955D62; Fri, 12 Sep 2025 14:29:57 +0000 (UTC)","from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.45.224.48])\n\tby mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 5CE921800446; Fri, 12 Sep 2025 14:29:55 +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=\"XOZZg5rf\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1757687402;\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=0fSFAIJZntFQZiUxp89Nz+5tbwQJsaOW9Dq9gxzig24=;\n\tb=XOZZg5rfviXQP/95ueOFPm3zupxMRwUvHSG99pMiCVjCppW4VhdYQseqOm9KraiJutOIbL\n\tMpMjX+wBnybPQpCOHonXEBQJGfx7WpNArObk/vFIIFtp7bkfGRYYIHqqgQc9r1LgEmMs+s\n\tjgSao0dV46VlQ0QdR10vqwO6YghL41I=","X-MC-Unique":"Qq0lNngUM7GHy7STShbVUw-1","X-Mimecast-MFC-AGG-ID":"Qq0lNngUM7GHy7STShbVUw_1757687397","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal , Kieran Bingham\n\t, =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?=\n\t, Laurent Pinchart\n\t, Paul Elder\n\t","Subject":"[PATCH v18 11/12] config: Make configuration file locations\n\tconfigurable","Date":"Fri, 12 Sep 2025 16:29:13 +0200","Message-ID":"<20250912142915.53949-13-mzamazal@redhat.com>","In-Reply-To":"<20250912142915.53949-1-mzamazal@redhat.com>","References":"<20250912142915.53949-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.4.1 on 10.30.177.93","X-Mimecast-Spam-Score":"0","X-Mimecast-MFC-PROC-ID":"ZqjeP_aasxx7ZuBUMuY56aiR5JhKgcpoF9wK7fZHSMU_1757687397","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":"To support easy switching of configurations, let's introduce\nLIBCAMERA_CONFIG_DIR and LIBCAMERA_CONFIG_NAME environment variables.\n\nLIBCAMERA_CONFIG_DIR environment variable specifies a directory or a\nlist of directories separated by colons where to look for the libcamera\nconfiguration file before trying the standard locations. This override\ncan be useful in a meson devenv.\n\nLIBCAMERA_CONFIG_NAME\n- specifies the path of the configuration file to load if it is an\n absolute path (useful to quickly try some configuration); or\n- prevents any configuration file from loading if it is defined and\n empty (useful to disable all configuration files); or\n- specifies the path of the configuration file to load, relative to\n the configuration directories (useful to quickly select between\n different configurations).\n\nIf a configuration file specified by those environment variables doesn't\nexist, no configuration file is loaded.\n\nReviewed-by: Paul Elder \nSigned-off-by: Milan Zamazal \n---\n Documentation/runtime_configuration.rst | 13 +++++++\n src/libcamera/global_configuration.cpp | 50 +++++++++++++++++--------\n 2 files changed, 47 insertions(+), 16 deletions(-)","diff":"diff --git a/Documentation/runtime_configuration.rst b/Documentation/runtime_configuration.rst\nindex 702139544..5307f3645 100644\n--- a/Documentation/runtime_configuration.rst\n+++ b/Documentation/runtime_configuration.rst\n@@ -19,6 +19,19 @@ order:\n - LIBCAMERA_SYSCONF_DIR/configuration.yaml\n - LIBCAMERA_DATA_DIR/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\n+in the locations above, or a whole absolute path. If an absolute path is\n+specified then it is the only location that is used; if the given file\n+doesn't exist then no configuration file is read. If the variable is\n+defined but empty, no configuration is loaded.\n+\n The first configuration file found wins, configuration files in other\n locations are ignored.\n \ndiff --git a/src/libcamera/global_configuration.cpp b/src/libcamera/global_configuration.cpp\nindex 592edcf30..8c2670e03 100644\n--- a/src/libcamera/global_configuration.cpp\n+++ b/src/libcamera/global_configuration.cpp\n@@ -23,13 +23,6 @@\n \n namespace libcamera {\n \n-namespace {\n-const std::vector globalConfigurationFiles = {\n-\tstd::filesystem::path(LIBCAMERA_SYSCONF_DIR) / \"configuration.yaml\",\n-\tstd::filesystem::path(LIBCAMERA_DATA_DIR) / \"configuration.yaml\",\n-};\n-}\n-\n LOG_DEFINE_CATEGORY(Configuration)\n \n /**\n@@ -80,6 +73,33 @@ bool GlobalConfiguration::loadFile(const std::filesystem::path &fileName)\n \n void GlobalConfiguration::load()\n {\n+\tconst char *libcameraConfigName =\n+\t\tutils::secure_getenv(\"LIBCAMERA_CONFIG_NAME\");\n+\tif (libcameraConfigName && libcameraConfigName[0] == '\\0')\n+\t\treturn;\n+\tif (!libcameraConfigName)\n+\t\tlibcameraConfigName = \"\";\n+\n+\tstd::filesystem::path configName(libcameraConfigName);\n+\n+\tif (configName.is_absolute()) {\n+\t\tloadFile(configName);\n+\t\treturn;\n+\t}\n+\n+\tif (configName.empty())\n+\t\tconfigName = std::filesystem::path(\"configuration.yaml\");\n+\n+\tstd::vector configurationDirectories;\n+\n+\tconst char *configDir = utils::secure_getenv(\"LIBCAMERA_CONFIG_DIR\");\n+\tif (configDir) {\n+\t\tfor (auto const &path : utils::split(configDir, \":\")) {\n+\t\t\tif (!path.empty())\n+\t\t\t\tconfigurationDirectories.push_back(path);\n+\t\t}\n+\t}\n+\n \tstd::filesystem::path userConfigurationDirectory;\n \tconst char *xdgConfigHome = utils::secure_getenv(\"XDG_CONFIG_HOME\");\n \tif (xdgConfigHome) {\n@@ -90,18 +110,16 @@ void GlobalConfiguration::load()\n \t\t\tuserConfigurationDirectory =\n \t\t\t\tstd::filesystem::path(home) / \".config\";\n \t}\n+\tif (!userConfigurationDirectory.empty())\n+\t\tconfigurationDirectories.push_back(\n+\t\t\tuserConfigurationDirectory / \"libcamera\");\n \n-\tif (!userConfigurationDirectory.empty()) {\n-\t\tstd::filesystem::path user_configuration_file =\n-\t\t\tuserConfigurationDirectory / \"libcamera\" / \"configuration.yaml\";\n-\t\tif (loadFile(user_configuration_file))\n-\t\t\treturn;\n-\t}\n+\tconfigurationDirectories.push_back(LIBCAMERA_SYSCONF_DIR);\n+\tconfigurationDirectories.push_back(LIBCAMERA_DATA_DIR);\n \n-\tfor (const auto &path : globalConfigurationFiles) {\n-\t\tif (loadFile(path))\n+\tfor (const auto &path : configurationDirectories)\n+\t\tif (loadFile(path / configName))\n \t\t\treturn;\n-\t}\n }\n \n /**\n","prefixes":["v18","11/12"]}