From nobody Mon Feb 9 01:06:36 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1665139489; cv=none; d=zohomail.com; s=zohoarc; b=SuHLrz6DhkGcdcFaOl4vkpAfgsGHvd/tyaCWgTsIO7vn582iI3Mi5R0IEgK2crhjj/sunDnW5BSdloqI5otfxJKcaeM0mXyz8i7n0T7nDt6ON/Nf+VmJ9f5Kx/fBqO3QXxX+5k9BLwj5d1WMUKUul3C1GLb/ihXthXwedtuh7OI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1665139489; 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=HPU9XH143wPdQJBv47pGlOBujaqXXYBEZxF7nFhLGdA=; b=MfaObDAU+PJTQ5pKBNNK5vWCWXnp0RyWUP/iOJV7vZPYmSaoUM1aoZOdRNXvNoACbiXfaPjcAHKu4Innp0RDtzz4DnTVJ5RtmX27eDMQJv9A+O+9S/26Ls4limtIhqHPcCl6XE+5zCexbHKvET5hQzOKSpZFgp/iFOE5S8rules= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1665139489947879.7682526353204; Fri, 7 Oct 2022 03:44:49 -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-34-w0XaJ1NxN5yJXui-YVgm_g-1; Fri, 07 Oct 2022 06:44:45 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7B07295E3D2; Fri, 7 Oct 2022 10:44:42 +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 68D2F2166B35; Fri, 7 Oct 2022 10:44:42 +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 F2E711946A4E; Fri, 7 Oct 2022 10:44:41 +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 95B7E1946A49 for ; Fri, 7 Oct 2022 10:44:39 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 78E569D49F; Fri, 7 Oct 2022 10:44:39 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1E2BB728FC 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=1665139488; 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=HPU9XH143wPdQJBv47pGlOBujaqXXYBEZxF7nFhLGdA=; b=BFx/rBcQcA02DdzcAv5YNYAgQdEy12l9lk768yX0/udRPSDz4k4REzxUPj8ncPCiZ7SYbE Y3nDajstZVZs5kjoQhoFqDCwcoRLFBz91Ighvp1dFMwsoJIT9Ftet0pconPBupQkRyOr9A m+PisC7WUtpHNxW8Ye1npqrwjm+zJSY= X-MC-Unique: w0XaJ1NxN5yJXui-YVgm_g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 3/5] meson: Replace external_program.path() with external_program.full_path() Date: Fri, 7 Oct 2022 12:44:23 +0200 Message-Id: <4829a645654fb4a6e67134a60b3e9836a2b22ed3.1665139419.git.mprivozn@redhat.com> 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.6 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: 1665139490277100005 Content-Type: text/plain; charset="utf-8"; x-default="true" The path() method is deprecated in 0.55.0 and we're recommended to use full_path() instead. Interestingly, we were already doing do in couple of place, but not all of them. Signed-off-by: Michal Privoznik --- build-aux/meson.build | 10 +++++----- docs/meson.build | 8 ++++---- meson.build | 36 ++++++++++++++++++------------------ src/access/meson.build | 2 +- src/meson.build | 22 +++++++++++----------- src/network/meson.build | 2 +- tests/meson.build | 2 +- 7 files changed, 41 insertions(+), 41 deletions(-) diff --git a/build-aux/meson.build b/build-aux/meson.build index 1c6b7fab53..16d085505d 100644 --- a/build-aux/meson.build +++ b/build-aux/meson.build @@ -1,6 +1,6 @@ flake8_path =3D '' if flake8_prog.found() - flake8_path =3D flake8_prog.path() + flake8_path =3D flake8_prog.full_path() endif =20 if host_machine.system() =3D=3D 'freebsd' or host_machine.system() =3D=3D = 'darwin' @@ -33,10 +33,10 @@ syntax_check_conf =3D configuration_data({ 'top_builddir': meson.project_build_root(), 'flake8_path': flake8_path, 'runutf8': ' '.join(runutf8), - 'PYTHON3': python3_prog.path(), - 'GREP': grep_prog.path(), - 'SED': sed_prog.path(), - 'AWK': awk_prog.path(), + 'PYTHON3': python3_prog.full_path(), + 'GREP': grep_prog.full_path(), + 'SED': sed_prog.full_path(), + 'AWK': awk_prog.full_path(), }) =20 configure_file( diff --git a/docs/meson.build b/docs/meson.build index d88879fd2f..5c0c762db1 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -129,7 +129,7 @@ aclperms_gen =3D custom_target( ) =20 docs_timestamp =3D run_command( - python3_prog, meson_timestamp_prog.path(), env: runutf8, check: true, + python3_prog, meson_timestamp_prog.full_path(), env: runutf8, check: tru= e, ).stdout().strip() =20 site_xsl =3D files('site.xsl') @@ -175,7 +175,7 @@ docs_programs_groups =3D [ foreach item : docs_programs_groups prog =3D find_program(item.get('prog'), dirs: libvirt_sbin_path) varname =3D item.get('name').underscorify() - conf.set_quoted(varname.to_upper(), prog.path()) + conf.set_quoted(varname.to_upper(), prog.full_path()) set_variable('@0@_prog'.format(varname), prog) endforeach =20 @@ -348,7 +348,7 @@ endforeach run_target( 'install-web', command: [ - meson_python_prog, python3_prog.path(), meson_install_web_prog.path(), + meson_python_prog, python3_prog.full_path(), meson_install_web_prog.fu= ll_path(), install_web_files, ], depends: install_web_deps, @@ -358,7 +358,7 @@ test( 'check-html-references', python3_prog, args: [ - check_html_references_prog.path(), + check_html_references_prog.full_path(), '--prefix', meson.project_build_root() / 'docs' ], diff --git a/meson.build b/meson.build index 92f22d3538..822344e8a1 100644 --- a/meson.build +++ b/meson.build @@ -798,14 +798,14 @@ endif foreach name : required_programs prog =3D find_program(name, dirs: libvirt_sbin_path) varname =3D name.underscorify() - conf.set_quoted(varname.to_upper(), prog.path()) + conf.set_quoted(varname.to_upper(), prog.full_path()) set_variable('@0@_prog'.format(varname), prog) endforeach =20 foreach item : required_programs_groups prog =3D find_program(item.get('prog'), dirs: libvirt_sbin_path) varname =3D item.get('name').underscorify() - conf.set_quoted(varname.to_upper(), prog.path()) + conf.set_quoted(varname.to_upper(), prog.full_path()) set_variable('@0@_prog'.format(varname), prog) endforeach =20 @@ -835,7 +835,7 @@ foreach name : optional_programs prog =3D find_program(name, required: false, dirs: libvirt_sbin_path) varname =3D name.underscorify() if prog.found() - prog_path =3D prog.path() + prog_path =3D prog.full_path() else prog_path =3D name endif @@ -1446,9 +1446,9 @@ if not get_option('driver_bhyve').disabled() and host= _machine.system() =3D=3D 'freeb =20 if bhyve_prog.found() and bhyvectl_prog.found() and bhyveload_prog.found= () conf.set('WITH_BHYVE', 1) - conf.set_quoted('BHYVE', bhyve_prog.path()) - conf.set_quoted('BHYVECTL', bhyvectl_prog.path()) - conf.set_quoted('BHYVELOAD', bhyveload_prog.path()) + conf.set_quoted('BHYVE', bhyve_prog.full_path()) + conf.set_quoted('BHYVECTL', bhyvectl_prog.full_path()) + conf.set_quoted('BHYVELOAD', bhyveload_prog.full_path()) endif elif get_option('driver_bhyve').enabled() error('The bhyve driver cannot be enabled') @@ -1690,7 +1690,7 @@ if not get_option('driver_qemu').disabled() required: false ) if qemu_bridge_prog.found() - qemu_bridge_path =3D qemu_bridge_prog.path() + qemu_bridge_path =3D qemu_bridge_prog.full_path() else qemu_bridge_path =3D '/usr/libexec/qemu-bridge-helper' endif @@ -1702,7 +1702,7 @@ if not get_option('driver_qemu').disabled() required: false ) if qemu_pr_prog.found() - qemu_pr_path =3D qemu_pr_prog.path() + qemu_pr_path =3D qemu_pr_prog.full_path() else qemu_pr_path =3D '/usr/bin/qemu-pr-helper' endif @@ -1714,7 +1714,7 @@ if not get_option('driver_qemu').disabled() required: false ) if qemu_slirp_prog.found() - qemu_slirp_path =3D qemu_slirp_prog.path() + qemu_slirp_path =3D qemu_slirp_prog.full_path() else qemu_slirp_path =3D '/usr/bin/slirp-helper' endif @@ -1726,7 +1726,7 @@ if not get_option('driver_qemu').disabled() required: false ) if qemu_dbus_daemon_prog.found() - qemu_dbus_daemon_path =3D qemu_dbus_daemon_prog.path() + qemu_dbus_daemon_path =3D qemu_dbus_daemon_prog.full_path() else qemu_dbus_daemon_path =3D '/usr/bin/dbus-daemon' endif @@ -1822,14 +1822,14 @@ if conf.has('WITH_LIBVIRTD') use_storage =3D true =20 conf.set('WITH_STORAGE_FS', 1) - conf.set_quoted('MOUNT', mount_prog.path()) - conf.set_quoted('UMOUNT', umount_prog.path()) - conf.set_quoted('MKFS', mkfs_prog.path()) + conf.set_quoted('MOUNT', mount_prog.full_path()) + conf.set_quoted('UMOUNT', umount_prog.full_path()) + conf.set_quoted('MKFS', mkfs_prog.full_path()) =20 showmount_prog =3D find_program('showmount', required: false, dirs: = libvirt_sbin_path) showmount_path =3D '' if showmount_prog.found() - showmount_path =3D showmount_prog.path() + showmount_path =3D showmount_prog.full_path() endif conf.set_quoted('SHOWMOUNT', showmount_path) endif @@ -1879,7 +1879,7 @@ if conf.has('WITH_LIBVIRTD') conf.set('WITH_STORAGE_LVM', 1) =20 foreach name : lvm_progs - conf.set_quoted(name.to_upper(), get_variable('@0@_prog'.format(na= me)).path()) + conf.set_quoted(name.to_upper(), get_variable('@0@_prog'.format(na= me)).full_path()) endforeach endif endif @@ -2033,7 +2033,7 @@ if not get_option('numad').disabled() and numactl_dep= .found() numad_prog =3D find_program('numad', required: get_option('numad'), dirs= : libvirt_sbin_path) if numad_prog.found() conf.set('WITH_NUMAD', 1) - conf.set_quoted('NUMAD', numad_prog.path()) + conf.set_quoted('NUMAD', numad_prog.full_path()) endif elif get_option('numad').enabled() error('You must have numactl enabled for numad support.') @@ -2148,7 +2148,7 @@ if git configuration: spec_conf, ) =20 - authors =3D run_command(python3_prog, meson_gen_authors_prog.path(), + authors =3D run_command(python3_prog, meson_gen_authors_prog.full_path(), env: runutf8, check: true) authors_file =3D 'AUTHORS.rst.in' =20 @@ -2170,7 +2170,7 @@ if git =20 foreach file : dist_files meson.add_dist_script( - meson_python_prog.path(), python3_prog.path(), meson_dist_prog.path(= ), + meson_python_prog.full_path(), python3_prog.full_path(), meson_dist_= prog.full_path(), meson.project_build_root(), file ) endforeach diff --git a/src/access/meson.build b/src/access/meson.build index 4d563a1a60..07fd7d372e 100644 --- a/src/access/meson.build +++ b/src/access/meson.build @@ -120,6 +120,6 @@ generated_sym_files +=3D access_gen_sym test( 'check-aclperms', python3_prog, - args: [ check_aclperms_prog.path(), access_perm_h, files('viraccessperm.= c') ], + args: [ check_aclperms_prog.full_path(), access_perm_h, files('viraccess= perm.c') ], env: runutf8, ) diff --git a/src/meson.build b/src/meson.build index 916bf1c863..35951d8990 100644 --- a/src/meson.build +++ b/src/meson.build @@ -909,7 +909,7 @@ virt_install_dirs +=3D [ ] =20 meson.add_install_script( - meson_python_prog.path(), python3_prog.path(), meson_install_dirs_prog.p= ath(), + meson_python_prog.full_path(), python3_prog.full_path(), meson_install_d= irs_prog.full_path(), virt_install_dirs, ) =20 @@ -920,7 +920,7 @@ if host_machine.system() =3D=3D 'linux' test( 'check-symfile', python3_prog, - args: [ check_symfile_prog.path(), libvirt_syms, libvirt_lib ], + args: [ check_symfile_prog.full_path(), libvirt_syms, libvirt_lib ], env: runutf8, ) =20 @@ -928,7 +928,7 @@ if host_machine.system() =3D=3D 'linux' test( 'check-admin-symfile', python3_prog, - args: [ check_symfile_prog.path(), libvirt_admin_syms, libvirt_admin= _lib ], + args: [ check_symfile_prog.full_path(), libvirt_admin_syms, libvirt_= admin_lib ], env: runutf8, ) endif @@ -938,7 +938,7 @@ test( 'check-symsorting', python3_prog, args: [ - check_symsorting_prog.path(), + check_symsorting_prog.full_path(), meson.current_source_dir(), files(sym_files, used_sym_files), ], @@ -949,7 +949,7 @@ test( 'check-admin-symsorting', python3_prog, args: [ - check_symsorting_prog.path(), + check_symsorting_prog.full_path(), meson.current_source_dir(), libvirt_admin_private_syms, ], @@ -960,7 +960,7 @@ test( 'check-drivername', python3_prog, args: [ - check_drivername_prog.path(), files(driver_headers), + check_drivername_prog.full_path(), files(driver_headers), files('libvirt_public.syms'), libvirt_qemu_syms, libvirt_lxc_syms, ], env: runutf8, @@ -970,7 +970,7 @@ test( 'check-admin-drivername', python3_prog, args: [ - check_drivername_prog.path(), libvirt_admin_public_syms, + check_drivername_prog.full_path(), libvirt_admin_public_syms, ], env: runutf8, ) @@ -978,14 +978,14 @@ test( test( 'check-driverimpls', python3_prog, - args: [ check_driverimpls_prog.path(), driver_source_files ], + args: [ check_driverimpls_prog.full_path(), driver_source_files ], env: runutf8, ) =20 test( 'check-aclrules', python3_prog, - args: [ check_aclrules_prog.path(), files('remote/remote_protocol.x'), s= tateful_driver_source_files ], + args: [ check_aclrules_prog.full_path(), files('remote/remote_protocol.x= '), stateful_driver_source_files ], env: runutf8, ) =20 @@ -1010,11 +1010,11 @@ if pdwtags_prog.found() and cc.get_id() !=3D 'clang' 'check-@0@'.format(proto['name']), python3_prog, args: [ - check_remote_protocol_prog.path(), + check_remote_protocol_prog.full_path(), proto['name'], lib.name(), lib.full_path(), - pdwtags_prog.path(), + pdwtags_prog.full_path(), files('@0@-structs'.format(proto['name'])), ], env: runutf8, diff --git a/src/network/meson.build b/src/network/meson.build index 395074a0a0..d5f9ba2254 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -90,7 +90,7 @@ if conf.has('WITH_NETWORK') ) =20 meson.add_install_script( - meson_python_prog.path(), python3_prog.path(), meson_install_symlink_p= rog.path(), + meson_python_prog.full_path(), python3_prog.full_path(), meson_install= _symlink_prog.full_path(), confdir / 'qemu' / 'networks' / 'autostart', '../default.xml', 'default.xml', ) diff --git a/tests/meson.build b/tests/meson.build index 967a01fe14..1149211756 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -700,7 +700,7 @@ testenv +=3D 'VIR_TEST_FILE_ACCESS=3D1' add_test_setup( 'access', env: testenv, - exe_wrapper: [ python3_prog, check_file_access_prog.path() ], + exe_wrapper: [ python3_prog, check_file_access_prog.full_path() ], ) =20 add_test_setup( --=20 2.35.1