From nobody Fri Oct 25 15:41:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1683047767; cv=none; d=zohomail.com; s=zohoarc; b=blH4IPNqpXgTnjy7cS5IAovS6guqSRGTPr/0Dz55SluImeUxbz/bDnSbgWd1jVE7E5harxAzO8MpiEIBOxJ380wCbBLSNT0KWLePlrjWcqlzeLPHGUDaHt9M+ZTxXYqRfcZnpYJ7Q6BieKsf0oNhl7PRV4sjunUJPh1lm/2m170= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683047767; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Havv6tFUOgsLcPftWL9ANG2HUGkhzKnb32kWcVNej5M=; b=YOC7DfgCI6H/bk2sdVqDgTC37HUMbcXKPNXTSzdvyIgGEW2vFt0WlIjSY+CfCwaSJgjKOWgodOts4ZSLWoFDbU1qvOndm68ov37BEOC11b5E43s90Tf9mAcD3S+tADHGS0rBZQ/Lfz+up2iDjkyxwrL6UY7uWTOZeizphwlVb3w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1683047767099417.7407835281771; Tue, 2 May 2023 10:16:07 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-195-4nOZ23A4PpeB-wwWALDljg-1; Tue, 02 May 2023 13:16:03 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1BFD5857FB9; Tue, 2 May 2023 17:15:58 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 64F641121331; Tue, 2 May 2023 17:15:56 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D990419465A8; Tue, 2 May 2023 17:15:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 34FE8194658C for ; Tue, 2 May 2023 17:15:55 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2951A2026E1C; Tue, 2 May 2023 17:15:55 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.224.51]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AE24A2026DFD for ; Tue, 2 May 2023 17:15:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1683047766; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Havv6tFUOgsLcPftWL9ANG2HUGkhzKnb32kWcVNej5M=; b=MdKtZJjqpRNs/wv57g+FiSAqOFdRRic4AoSQppkomnL3nWwg96HY+q/BxG6dBSMo4ONIhN MTg9dS4zLmAu5FU+J6YN+BEUOH5dTOJaaOwrFigmoQkXS13th9KbL4VfY8RPzhTXJ/aMUf YeXeapKLOi//B4pcvViERaXn574ojJU= X-MC-Unique: 4nOZ23A4PpeB-wwWALDljg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 1/5] meson: Introduce initconfdir option Date: Tue, 2 May 2023 19:15:48 +0200 Message-Id: <20230502171552.25767-2-abologna@redhat.com> In-Reply-To: <20230502171552.25767-1-abologna@redhat.com> References: <20230502171552.25767-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1683047767450100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Right now we expect the configuration files for init scripts to live in /etc/sysconfig, but that location is only used by RHEL- and SUSE-derived distros. This means that packagers for other distros have to patch things as part of the build process, while people building from source will get wonky integration. This new option will provide a convenient way to override the default location at build time that is usable by distro packagers and people building from source alike. Signed-off-by: Andrea Bolognani Reviewed-by: Martin Kletzander --- meson.build | 5 +++++ meson_options.txt | 1 + 2 files changed, 6 insertions(+) diff --git a/meson.build b/meson.build index bad13c0c9d..8da987b1cb 100644 --- a/meson.build +++ b/meson.build @@ -76,6 +76,11 @@ if runstatedir =3D=3D '' runstatedir =3D localstatedir / 'run' endif =20 +initconfdir =3D get_option('initconfdir') +if initconfdir =3D=3D '' + initconfdir =3D sysconfdir / 'sysconfig' +endif + bindir =3D prefix / get_option('bindir') datadir =3D prefix / get_option('datadir') includedir =3D prefix / get_option('includedir') diff --git a/meson_options.txt b/meson_options.txt index 861c5577d2..9174c4021c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -3,6 +3,7 @@ option('packager', type: 'string', value: '', description: = 'Extra packager name' option('packager_version', type: 'string', value: '', description: 'Extra = packager version') option('system', type: 'boolean', value: false, description: 'Set install = paths to system ones') option('runstatedir', type: 'string', value: '', description: 'State direc= tory for temporary sockets, pid files, etc') +option('initconfdir', type: 'string', value: '', description: 'directory f= or init script configuration files') option('expensive_tests', type: 'feature', value: 'auto', description: 'se= t the default for enabling expensive tests (long timeouts)') option('test_coverage', type: 'boolean', value: false, description: 'turn = on code coverage instrumentation') option('git_werror', type: 'feature', value: 'auto', description: 'use -We= rror if building from GIT') --=20 2.40.1