From nobody Sun Feb 8 17:46:32 2026 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=1665139488; cv=none; d=zohomail.com; s=zohoarc; b=mwCWepQRAamioRjw744ZXI9aVZKPtRw4uz70dBlZmlXO7EZH/jzzHg44Ivim/j8DcCQICP7KO9vYGd3qJxW2dtwQciCeNy7aPjDgmvsd9LLSojrnzoeq9tyIuNNSKFNaifzo/IXJJzlIH5BBtO5DwLQSFIymN1QVEH9zQw5p71I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1665139488; 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=gDAB/dbSV1YpI1ibsL9XVGhhRyPG1ymTXepBtpQQyns=; b=dzVq4sKo4jTd3Qu3qWpJ0keEziKxBK1MFolfXq7zMcQySk5e1W1PM+OyC6BXCIIGzl8k20FudiHKO9F1DbJkao82aM1zieY/19+Z1sdRuKDFlE/tK3/x/LwXHqub9DpYp/vPyUwM4tpjYT2jiwzJcofk/YUtKlXTxIY6mTugZAI= 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 1665139488143208.92730473389474; Fri, 7 Oct 2022 03:44:48 -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-75-6-xSkO0gPiedECQhTtWuQA-1; Fri, 07 Oct 2022 06:44:43 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CDF5D95E3B6; Fri, 7 Oct 2022 10:44:40 +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 B842A2022EA2; Fri, 7 Oct 2022 10:44:40 +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 1E0D21946A75; Fri, 7 Oct 2022 10:44:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 03DA81946A75 for ; Fri, 7 Oct 2022 10:44:39 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id DC8B49D49F; Fri, 7 Oct 2022 10:44:38 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7F2C317582 for ; Fri, 7 Oct 2022 10:44:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1665139487; 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=gDAB/dbSV1YpI1ibsL9XVGhhRyPG1ymTXepBtpQQyns=; b=QRUtb+iHcq4eiBTvjYuhkieE+HPcDv/nLQX2t0ZabYRT0TtUy/omJ2y5XmnQTioWrfdSIX C5pEAs5vo3LHhqMCkOsq4N9QpWwyvSkfYtHZrfbNTDbm5ZIcvHzUEchLB+7Tf981odUoHO VUgkrfYouDGX1qfUHZpszJehs013Y4E= X-MC-Unique: 6-xSkO0gPiedECQhTtWuQA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 2/5] meson: Replace meson.source_root() with meson.project_source_root() Date: Fri, 7 Oct 2022 12:44:22 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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.4 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: 1665139490245100004 Content-Type: text/plain; charset="utf-8"; x-default="true" The source_root() method is deprecated in 0.56.0 and we're recommended to use project_source_root() instead. Signed-off-by: Michal Privoznik --- build-aux/meson.build | 2 +- docs/meson.build | 4 ++-- meson.build | 4 ++-- po/meson.build | 2 +- src/access/meson.build | 2 +- src/esx/meson.build | 4 ++-- src/hyperv/meson.build | 2 +- src/meson.build | 4 ++-- src/util/meson.build | 4 ++-- tests/meson.build | 4 ++-- tools/wireshark/src/libvirt/meson.build | 8 ++++---- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/build-aux/meson.build b/build-aux/meson.build index 6017f07c0a..1c6b7fab53 100644 --- a/build-aux/meson.build +++ b/build-aux/meson.build @@ -29,7 +29,7 @@ endif awk_prog =3D find_program('awk') =20 syntax_check_conf =3D configuration_data({ - 'top_srcdir': meson.source_root(), + 'top_srcdir': meson.project_source_root(), 'top_builddir': meson.project_build_root(), 'flake8_path': flake8_path, 'runutf8': ' '.join(runutf8), diff --git a/docs/meson.build b/docs/meson.build index 2b292b1a5a..d88879fd2f 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -263,7 +263,7 @@ hvsupport_html_in =3D custom_target( meson_python_prog, python3_prog, hvsupport_prog, - meson.source_root(), + meson.project_source_root(), meson.project_build_root(), ], capture: true, @@ -282,7 +282,7 @@ html_xslt_gen +=3D { 'file': hvsupport_html_in, } =20 -news_html_in =3D docs_rst2html5_gen.process(meson.source_root() / 'NEWS.rs= t') +news_html_in =3D docs_rst2html5_gen.process(meson.project_source_root() / = 'NEWS.rst') html_xslt_gen +=3D { 'name': 'news', 'file': news_html_in, diff --git a/meson.build b/meson.build index b7a0e4726f..92f22d3538 100644 --- a/meson.build +++ b/meson.build @@ -27,7 +27,7 @@ conf =3D configuration_data() =20 conf.set('_GNU_SOURCE', 1) conf.set_quoted('abs_top_builddir', meson.project_build_root()) -conf.set_quoted('abs_top_srcdir', meson.source_root()) +conf.set_quoted('abs_top_srcdir', meson.project_source_root()) conf.set_quoted('PACKAGE', meson.project_name()) conf.set_quoted('PACKAGE_NAME', meson.project_name()) conf.set_quoted('PACKAGE_VERSION', meson.project_version()) @@ -514,7 +514,7 @@ elif host_machine.system() =3D=3D 'darwin' # macOS libraries don't support symbol versioning version_script_flags =3D '' else - test_file =3D '@0@/src/libvirt_qemu.syms'.format(meson.source_root()) + test_file =3D '@0@/src/libvirt_qemu.syms'.format(meson.project_source_ro= ot()) if cc.has_link_argument('-Wl,--version-script=3D@0@'.format(test_file)) version_script_flags =3D '-Wl,--version-script=3D' else diff --git a/po/meson.build b/po/meson.build index 0f2a1bb617..fbfdc2d08d 100644 --- a/po/meson.build +++ b/po/meson.build @@ -7,7 +7,7 @@ i18n.gettext( '--keyword=3D_', '--keyword=3DN_', '--add-comments=3DTRANSLATORS:', - '--directory=3D@0@'.format(meson.source_root()), + '--directory=3D@0@'.format(meson.project_source_root()), '--directory=3D@0@'.format(meson.project_build_root()), '--files-from=3D@0@'.format(meson.current_source_dir() / 'POTFILES'), '--msgid-bugs-address=3Dhttps://libvirt.org/bugs.html', diff --git a/src/access/meson.build b/src/access/meson.build index 36aff6fd88..4d563a1a60 100644 --- a/src/access/meson.build +++ b/src/access/meson.build @@ -11,7 +11,7 @@ access_polkit_sources =3D [ =20 access_perm_h =3D files('viraccessperm.h') =20 -remote_path =3D meson.source_root() / 'src' / 'remote' +remote_path =3D meson.project_source_root() / 'src' / 'remote' =20 access_gen_headers =3D [] access_gen_sources =3D [] diff --git a/src/esx/meson.build b/src/esx/meson.build index 2d05294ba1..d1f42fdcc4 100644 --- a/src/esx/meson.build +++ b/src/esx/meson.build @@ -26,7 +26,7 @@ esx_gen_headers =3D custom_target( ], command: [ meson_python_prog, python3_prog, esx_vi_generator_prog, - meson.source_root() / 'src', + meson.project_source_root() / 'src', meson.project_build_root() / 'src', 'header', ], @@ -47,7 +47,7 @@ esx_gen_sources =3D custom_target( ], command: [ meson_python_prog, python3_prog, esx_vi_generator_prog, - meson.source_root() / 'src', + meson.project_source_root() / 'src', meson.project_build_root() / 'src', 'source', ], diff --git a/src/hyperv/meson.build b/src/hyperv/meson.build index 2589fc5437..3509ce12f7 100644 --- a/src/hyperv/meson.build +++ b/src/hyperv/meson.build @@ -18,7 +18,7 @@ hyperv_gen_sources =3D custom_target( ], command: [ meson_python_prog, python3_prog, hyperv_wmi_generator_prog, - meson.source_root() / 'src', + meson.project_source_root() / 'src', meson.project_build_root() / 'src', ], ) diff --git a/src/meson.build b/src/meson.build index 8000796733..916bf1c863 100644 --- a/src/meson.build +++ b/src/meson.build @@ -4,7 +4,7 @@ src_dep =3D declare_dependency( compile_args: [ '-DIN_LIBVIRT', '-Dabs_top_builddir=3D"@0@"'.format(meson.project_build_root()), - '-Dabs_top_srcdir=3D"@0@"'.format(meson.source_root()), + '-Dabs_top_srcdir=3D"@0@"'.format(meson.project_source_root()), ] + coverage_flags + win32_flags, dependencies: [ glib_dep, @@ -1033,7 +1033,7 @@ run_pkg_config_files =3D [ run_pkg_config_conf =3D configuration_data({ 'VERSION': meson.project_version(), 'abs_top_builddir': meson.project_build_root(), - 'abs_top_srcdir': meson.source_root(), + 'abs_top_srcdir': meson.project_source_root(), }) =20 foreach file : run_pkg_config_files diff --git a/src/util/meson.build b/src/util/meson.build index 07ae94631c..c81500ea04 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -137,8 +137,8 @@ keyname_list =3D [ 'win32', ] =20 -keymap_gen_prog =3D find_program('@0@/src/keycodemapdb/tools/keymap-gen'.f= ormat(meson.source_root())) -keymap_src_file =3D '@0@/src/keycodemapdb/data/keymaps.csv'.format(meson.s= ource_root()) +keymap_gen_prog =3D find_program('@0@/src/keycodemapdb/tools/keymap-gen'.f= ormat(meson.project_source_root())) +keymap_src_file =3D '@0@/src/keycodemapdb/data/keymaps.csv'.format(meson.p= roject_source_root()) =20 foreach name : keycode_list keycode_gen_sources +=3D custom_target( diff --git a/tests/meson.build b/tests/meson.build index 3819eb8ba9..967a01fe14 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -3,7 +3,7 @@ tests_dep =3D declare_dependency( '-Dabs_builddir=3D"@0@"'.format(meson.current_build_dir()), '-Dabs_top_builddir=3D"@0@"'.format(meson.project_build_root()), '-Dabs_srcdir=3D"@0@"'.format(meson.current_source_dir()), - '-Dabs_top_srcdir=3D"@0@"'.format(meson.source_root()), + '-Dabs_top_srcdir=3D"@0@"'.format(meson.project_source_root()), ] + coverage_flags + cc_flags_relaxed_frame_limit, dependencies: [ apparmor_dep, @@ -37,7 +37,7 @@ tests_env =3D [ 'abs_builddir=3D@0@'.format(meson.current_build_dir()), 'abs_srcdir=3D@0@'.format(meson.current_source_dir()), 'abs_top_builddir=3D@0@'.format(meson.project_build_root()), - 'abs_top_srcdir=3D@0@'.format(meson.source_root()), + 'abs_top_srcdir=3D@0@'.format(meson.project_source_root()), 'LC_ALL=3DC', 'LIBVIRT_AUTOSTART=3D0', ] diff --git a/tools/wireshark/src/libvirt/meson.build b/tools/wireshark/src/= libvirt/meson.build index 9d54f827d3..9c3b8aadc1 100644 --- a/tools/wireshark/src/libvirt/meson.build +++ b/tools/wireshark/src/libvirt/meson.build @@ -1,10 +1,10 @@ wireshark_protocol =3D custom_target( 'protocol.h', input: [ - meson.source_root() / 'src' / 'remote' / 'remote_protocol.x', - meson.source_root() / 'src' / 'remote' / 'qemu_protocol.x', - meson.source_root() / 'src' / 'remote' / 'lxc_protocol.x', - meson.source_root() / 'src' / 'rpc' / 'virkeepaliveprotocol.x', + meson.project_source_root() / 'src' / 'remote' / 'remote_protocol.x', + meson.project_source_root() / 'src' / 'remote' / 'qemu_protocol.x', + meson.project_source_root() / 'src' / 'remote' / 'lxc_protocol.x', + meson.project_source_root() / 'src' / 'rpc' / 'virkeepaliveprotocol.x', ], output: [ 'protocol.h', --=20 2.35.1