{"id":24022,"url":"https://patchwork.libcamera.org/api/patches/24022/?format=json","web_url":"https://patchwork.libcamera.org/patch/24022/","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":"<20250729073201.5369-13-mzamazal@redhat.com>","date":"2025-07-29T07:32:00","name":"[v16,12/12] config: Make configuration directories configurable","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"da854d5f86ad70c40449245d63fd49934fe89b1c","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/24022/mbox/","series":[{"id":5345,"url":"https://patchwork.libcamera.org/api/series/5345/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5345","date":"2025-07-29T07:31:48","name":"Add global configuration file","version":16,"mbox":"https://patchwork.libcamera.org/series/5345/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/24022/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/24022/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 CDA23C332A\n\tfor ;\n\tTue, 29 Jul 2025 07:32:56 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id CF4F6691E8;\n\tTue, 29 Jul 2025 09:32:55 +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 D9011691C9\n\tfor ;\n\tTue, 29 Jul 2025 09:32:40 +0200 (CEST)","from mx-prod-mc-01.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-380-zlKo5p9fMKiAp_ApuqPoFg-1;\n\tTue, 29 Jul 2025 03:32:36 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id 6748D19560B4; Tue, 29 Jul 2025 07:32:34 +0000 (UTC)","from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.43.17.23])\n\tby mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id D2BDB18001DD; Tue, 29 Jul 2025 07:32:32 +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=\"UAIwam9O\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1753774359;\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=8XG+YDsJXqrg1JhCl2tpo6LbJVvRVk6ur9BvRH8qr/c=;\n\tb=UAIwam9Oy4cX5hDnnqd2mrNGpurX0sc6rz4lF4S20BnXQsGhcT75frnwe9zdRdgdTJdhh7\n\tPCG3GVCQzZwFNXt8aF7CFzk8mR8f7pmWPoszXcHZ/GZ3Grua2m/69fl7Je0GXtUe+qHRhC\n\t8+46yAB1Btg4CieyRmHT9DqDPkss/rQ=","X-MC-Unique":"zlKo5p9fMKiAp_ApuqPoFg-1","X-Mimecast-MFC-AGG-ID":"zlKo5p9fMKiAp_ApuqPoFg_1753774354","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","Subject":"[PATCH v16 12/12] config: Make configuration directories\n\tconfigurable","Date":"Tue, 29 Jul 2025 09:32:00 +0200","Message-ID":"<20250729073201.5369-13-mzamazal@redhat.com>","In-Reply-To":"<20250729073201.5369-1-mzamazal@redhat.com>","References":"<20250729073201.5369-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":"e10aCcmVMFN3_491L-Gtfs09foSml7-ncCfERF6Udpw_1753774354","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/global_configuration.cpp | 28 ++++++++++++++-----------\n 2 files changed, 21 insertions(+), 12 deletions(-)","diff":"diff --git a/Documentation/runtime_configuration.rst b/Documentation/runtime_configuration.rst\nindex 71a1a175d..759f6f476 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 - 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\ndiff --git a/src/libcamera/global_configuration.cpp b/src/libcamera/global_configuration.cpp\nindex 68a4731a1..d80f5a158 100644\n--- a/src/libcamera/global_configuration.cpp\n+++ b/src/libcamera/global_configuration.cpp\n@@ -68,11 +68,6 @@ bool GlobalConfiguration::loadFile(const std::filesystem::path &fileName)\n \n void GlobalConfiguration::load()\n {\n-\tconst std::vector globalConfigurationDirectories = {\n-\t\tstd::filesystem::path(LIBCAMERA_SYSCONF_DIR),\n-\t\tstd::filesystem::path(LIBCAMERA_DATA_DIR),\n-\t};\n-\n \tconst char *libcameraConfigName =\n \t\tutils::secure_getenv(\"LIBCAMERA_CONFIG_NAME\");\n \tif (libcameraConfigName && libcameraConfigName[0] == '\\0')\n@@ -90,6 +85,16 @@ void GlobalConfiguration::load()\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@@ -100,15 +105,14 @@ 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\" / configName;\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 : globalConfigurationDirectories)\n+\tfor (const auto &path : configurationDirectories)\n \t\tif (loadFile(path / configName))\n \t\t\treturn;\n }\n","prefixes":["v16","12/12"]}