{"id":22761,"url":"https://patchwork.libcamera.org/api/1.1/patches/22761/?format=json","web_url":"https://patchwork.libcamera.org/patch/22761/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20250206161607.50738-15-mzamazal@redhat.com>","date":"2025-02-06T16:16:05","name":"[v7,14/15] config: Make configuration file configurable","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"b2941c7265592aeba611ee060e40aa1574d6d5e3","submitter":{"id":177,"url":"https://patchwork.libcamera.org/api/1.1/people/177/?format=json","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/22761/mbox/","series":[{"id":4993,"url":"https://patchwork.libcamera.org/api/1.1/series/4993/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4993","date":"2025-02-06T16:15:51","name":"Add global configuration file","version":7,"mbox":"https://patchwork.libcamera.org/series/4993/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/22761/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22761/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 B1FC6C32EF\n\tfor ;\n\tThu, 6 Feb 2025 16:16:59 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 309796861F;\n\tThu, 6 Feb 2025 17:16: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 0AE9D6860E\n\tfor ;\n\tThu, 6 Feb 2025 17:16:56 +0100 (CET)","from mx-prod-mc-04.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-151-BylZq5KTPFuX1RNUFQLdvA-1;\n\tThu, 06 Feb 2025 11:16:51 -0500","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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id C173E1955D68; Thu, 6 Feb 2025 16:16:48 +0000 (UTC)","from mzamazal-thinkpadp1gen3.tpbc.com (unknown [10.43.17.31])\n\tby mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id EB28F1800879; Thu, 6 Feb 2025 16:16:46 +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=\"GwUELevQ\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1738858612;\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=OuDHB5JL2haBcUF5rIDUA6khWaH9ac3saUkh91+9bXY=;\n\tb=GwUELevQ3L6iVKqY9np+XSKFhWaSeyyrhnKp1yMoGeiLSzXTK+cCZNt+igszcaRqULgC1R\n\tjH6RrwtLf3Ji3MOHOT6bUbavPuV+N8nh6Oj6IpUhdxr61F/K6dbhYpG42uSs0uwdWpLq//\n\tA/6nKXTYdBbHGB8NInYDc/UzO7JkLz8=","X-MC-Unique":"BylZq5KTPFuX1RNUFQLdvA-1","X-Mimecast-MFC-AGG-ID":"BylZq5KTPFuX1RNUFQLdvA","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 v7 14/15] config: Make configuration file configurable","Date":"Thu, 6 Feb 2025 17:16:05 +0100","Message-ID":"<20250206161607.50738-15-mzamazal@redhat.com>","In-Reply-To":"<20250206161607.50738-1-mzamazal@redhat.com>","References":"<20250206161607.50738-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":"-tWKP6-te9sUpyizLznOXF2LIlns2rsgPe5hgcxfr78_1738858608","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_NAME environment variable, which denotes:\n\n- The path of the configuration file to load if it is an absolute path; or\n- the path of the configuration file to load, relative to the configuration\n directories.\n\nIf such a configuration file doesn't exist, no custom configuration is\nloaded.\n\nSigned-off-by: Milan Zamazal \n---\n Documentation/runtime_configuration.rst | 8 +++++++\n src/libcamera/base/global_configuration.cpp | 26 ++++++++++++++++-----\n 2 files changed, 28 insertions(+), 6 deletions(-)","diff":"diff --git a/Documentation/runtime_configuration.rst b/Documentation/runtime_configuration.rst\nindex 943f8876..f0ad349b 100644\n--- a/Documentation/runtime_configuration.rst\n+++ b/Documentation/runtime_configuration.rst\n@@ -19,6 +19,14 @@ order:\n - LIBCAMERA_SYSCONF_DIR/configuration.yaml\n - /etc/libcamera/configuration.yaml\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 it can contain a whole relative or absolute\n+path. If an absolute path is specified then it is the only location that\n+is used; if the given file doesn't exist then no configuration file is\n+read.\n+\n The first configuration file found wins, contingent configuration files\n in other locations are ignored.\n \ndiff --git a/src/libcamera/base/global_configuration.cpp b/src/libcamera/base/global_configuration.cpp\nindex e69951b4..f35b3dae 100644\n--- a/src/libcamera/base/global_configuration.cpp\n+++ b/src/libcamera/base/global_configuration.cpp\n@@ -60,13 +60,27 @@ bool loadFile(const std::filesystem::path &fileName)\n }\n \n const std::vector\n-\tglobalConfigurationFiles = {\n-\t\tstd::filesystem::path(LIBCAMERA_SYSCONF_DIR) / \"configuration.yaml\",\n-\t\tstd::filesystem::path(\"/etc/libcamera/configuration.yaml\"),\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+\t\tutils::secure_getenv(\"LIBCAMERA_CONFIG_NAME\");\n+\tif (!libcameraConfigName)\n+\t\tlibcameraConfigName = \"\";\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::filesystem::path userConfigurationDirectory;\n \tchar *xdgConfigHome = utils::secure_getenv(\"XDG_CONFIG_HOME\");\n \tif (xdgConfigHome) {\n@@ -80,13 +94,13 @@ void load()\n \n \tif (!userConfigurationDirectory.empty()) {\n \t\tstd::filesystem::path user_configuration_file =\n-\t\t\tuserConfigurationDirectory / \"libcamera\" / \"configuration.yaml\";\n+\t\t\tuserConfigurationDirectory / \"libcamera\" / configName;\n \t\tif (loadFile(user_configuration_file))\n \t\t\treturn;\n \t}\n \n-\tfor (const auto &path : globalConfigurationFiles)\n-\t\tif (loadFile(path))\n+\tfor (const auto &path : globalConfigurationDirectories)\n+\t\tif (loadFile(path / configName))\n \t\t\treturn;\n }\n \n","prefixes":["v7","14/15"]}