From nobody Thu Dec 18 00:23:16 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@intel.com; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=intel.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1743585853763190.34816451311303; Wed, 2 Apr 2025 02:24:13 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 097B513DE; Wed, 2 Apr 2025 05:24:13 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 944AC13BE; Wed, 2 Apr 2025 05:23:53 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id B09C3136E; Wed, 2 Apr 2025 05:23:50 -0400 (EDT) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 0C994130C for ; Wed, 2 Apr 2025 05:23:49 -0400 (EDT) Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Apr 2025 02:23:49 -0700 Received: from spr-s2600bt.bj.intel.com ([10.240.192.127]) by fmviesa009-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Apr 2025 02:23:40 -0700 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743585830; x=1775121830; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=Q8QBmucGv/ytLxTh/uKJBAfj/rnRbEYt+leWHmwy+tk=; b=FMfM5V24lsehbK0ib/cow3+5a4FQiicS+Wd1T3gmh4fTyVhBR2U7s8wT 9j+Pw0yxSVJcH9HQhEV0OR9dGu6Z4Qe3M63+g9zoIl820+q47PBsBdCrG cHsfWEdE+6zj9qZ8kuqtyCc7WwfIttXUDVCh+aXjhfLZffPNHM392p4/1 CFXRGbo+a943ZYU28YurzOqZmKrLlPjqkXsBljAid8NKUYeqEZUsCqy+h vFtN99pQH2BWf3T6FdLwZP3C9Rw/6QHBg0WM36ltbKl9f1SVgffJvI+Zc ABt4EhpDPRvhu2YiqbFRzajz9W+oaqkwEr+uXGLcmicc0OUSJnT8fLdMH w==; X-CSE-ConnectionGUID: R+9A1EhOQgaTzb6n7sZlYQ== X-CSE-MsgGUID: XVgMYQfXRuCRTj1WGpItig== X-IronPort-AV: E=McAfee;i="6700,10204,11391"; a="70302783" X-IronPort-AV: E=Sophos;i="6.14,295,1736841600"; d="scan'208";a="70302783" X-CSE-ConnectionGUID: ISLZgGPhTnym4Dn0DwX1lw== X-CSE-MsgGUID: EXOzcjhpSC+VrGbe2y5z8A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,295,1736841600"; d="scan'208";a="127475880" From: Zhenzhong Duan To: devel@lists.libvirt.org Subject: [PATCH v2] meson: Add back prefix path for runstatedir Date: Wed, 2 Apr 2025 17:20:07 +0800 Message-Id: <20250402092007.3008618-1-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: JAE7TKJKQTJPPWND4IBEU3OO62OD5KNL X-Message-ID-Hash: JAE7TKJKQTJPPWND4IBEU3OO62OD5KNL X-MailFrom: zhenzhong.duan@intel.com X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0 CC: Zhenzhong Duan X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1743585856193019000 Content-Type: text/plain; charset="utf-8" Currently libvirt favors /run instead of /var/run, but for local build run test, a prefix path is still needed to avoid interoperating with OS vendor provided binaries. When 'system' option is specified, fixed path /run is honored. Fixes: e5299ddf86121d3c792ca271ffcb54900eb19dc3 Signed-off-by: Zhenzhong Duan --- v2: Take option `system` into consideration (Pavel) meson.build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index bf4a245dd3..2762236f37 100644 --- a/meson.build +++ b/meson.build @@ -62,11 +62,16 @@ if get_option('system') endif localstatedir =3D '/var' sysconfdir =3D '/etc' + runstatedir =3D '/run' else prefix =3D get_option('prefix') libdir =3D prefix / get_option('libdir') localstatedir =3D prefix / get_option('localstatedir') sysconfdir =3D prefix / get_option('sysconfdir') + runstatedir =3D get_option('runstatedir') + if runstatedir =3D=3D '' + runstatedir =3D prefix / 'run' + endif endif =20 # if --prefix is /usr, don't use /usr/var for localstatedir or /usr/etc for @@ -80,11 +85,6 @@ if prefix =3D=3D '/usr' endif endif =20 -runstatedir =3D get_option('runstatedir') -if runstatedir =3D=3D '' - runstatedir =3D '/run' -endif - initconfdir =3D get_option('initconfdir') if initconfdir =3D=3D '' if (os_release.contains('alpine') or --=20 2.34.1