From nobody Mon Apr 29 12:01:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1598374997; cv=none; d=zohomail.com; s=zohoarc; b=QxPEVEZ/kqLZEwjZm4YWObXmc6JP6g9aa/vTZ4H+xoZyuPJf+V9gwzRlRgTBd1ae544CwRAa7zIPhHC3zRpCKvtbtEavPW5cb6tpPiCe6fnZpWewXOTKd8Kh+hf6ujM+jbf1FSN2fwJuA6b+bTSHAsoHXcsAVy3SafBDTci+e5Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598374997; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=qSjWMLFOURD9CE9FJ81u17G2k1jFL2CVCs8tq8WDbrs=; b=M+/K+KSYR+dY8ggvYclpa8xP0Rs281oOPGo/K7uZXwwCzEUK8nNfHY1aoUBjDOMb23G8oFRSM/frkxTV4HvUOd3u5V0il/faf/frf5uktx3oXF/Y46r6YpTwMV1b6U5XnIIB3eRhApp/Mbx1r2nvyPbLz8fpw72X3FrEr+WA88g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1598374997024941.5633347202377; Tue, 25 Aug 2020 10:03:17 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-571-tExAUoC8PHaMrifdTtY0Ag-1; Tue, 25 Aug 2020 13:03:13 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BBD9410ABDB4; Tue, 25 Aug 2020 17:03:03 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8926D5C1C2; Tue, 25 Aug 2020 17:03:03 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 4A6D51826D2D; Tue, 25 Aug 2020 17:03:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 07PGcV5g025682 for ; Tue, 25 Aug 2020 12:38:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id AD868100238C; Tue, 25 Aug 2020 16:38:31 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.194.73]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EBDAA10013C1 for ; Tue, 25 Aug 2020 16:38:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598374995; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=qSjWMLFOURD9CE9FJ81u17G2k1jFL2CVCs8tq8WDbrs=; b=D/TDJZPFh6IpnSSplBfwDlG1WfYZCS8Pkcm28n5pKF+dDH0zEst3IF7zoTTfAvunvEQWKG FrnE3Y7blVrxLuv5ZDbRxJ0yrPZlDKhVfXiYR8fwy54GMZ4GW8EMoF01UnKICFki+SJeic oVlsPDPYx5w3ex9rHjFCm+UggL5LKN4= X-MC-Unique: tExAUoC8PHaMrifdTtY0Ag-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH] meson: Use @BASENAME@ more Date: Tue, 25 Aug 2020 18:38:25 +0200 Message-Id: <20200825163825.103718-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This patch takes care of just the obvious cases: there are many more situations where the data we pass to configure_file() could likely be obtained in a more effective way, but we can address the low-hanging fruits as a first approximation. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel Henrique Barboza --- include/libvirt/meson.build | 2 +- meson.build | 4 ++-- po/meson.build | 2 +- src/network/meson.build | 4 ++-- tools/meson.build | 10 +++++----- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/libvirt/meson.build b/include/libvirt/meson.build index 4b77a222f0..601b729c22 100644 --- a/include/libvirt/meson.build +++ b/include/libvirt/meson.build @@ -25,7 +25,7 @@ include_conf.merge_from(conf) =20 libvirt_common_h =3D configure_file( input: libvirt_common_h_in, - output: 'libvirt-common.h', + output: '@BASENAME@', configuration: include_conf, ) =20 diff --git a/meson.build b/meson.build index 35e3da6e55..d146fb3d11 100644 --- a/meson.build +++ b/meson.build @@ -106,7 +106,7 @@ configmake_conf.set_quoted('SYSCONFDIR', sysconfdir) =20 configure_file( input: 'configmake.h.in', - output: 'configmake.h', + output: '@BASENAME@', configuration: configmake_conf, ) =20 @@ -2335,7 +2335,7 @@ run_conf =3D configuration_data() run_conf.set('abs_builddir', meson.build_root()) configure_file( input: 'run.in', - output: 'run', + output: '@BASENAME@', configuration: run_conf, ) run_command('chmod', 'a+x', meson.current_build_dir() / 'run') diff --git a/po/meson.build b/po/meson.build index f9677408ec..69d8be726a 100644 --- a/po/meson.build +++ b/po/meson.build @@ -6,7 +6,7 @@ potfiles_conf.set('BUILDDIR', '') =20 potfiles =3D configure_file( input: 'POTFILES.in', - output: 'POTFILES', + output: '@BASENAME@', configuration: potfiles_conf, ) =20 diff --git a/src/network/meson.build b/src/network/meson.build index 2e031e811f..ae2848697a 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -93,7 +93,7 @@ if conf.has('WITH_NETWORK') =20 configure_file( input: 'default.xml.in', - output: 'default.xml', + output: '@BASENAME@', command: [ 'sed', '-e', 's||\\n @0@|'.format(uuid= ), '@INPUT@', @@ -105,7 +105,7 @@ if conf.has('WITH_NETWORK') else configure_file( input: 'default.xml.in', - output: 'default.xml', + output: '@BASENAME@', copy: true, install: true, install_dir: confdir / 'qemu' / 'networks', diff --git a/tools/meson.build b/tools/meson.build index e18adfa7f2..b8c6802f0a 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -235,7 +235,7 @@ tools_conf.set('sysconfdir', sysconfdir) =20 configure_file( input: 'virt-xml-validate.in', - output: 'virt-xml-validate', + output: '@BASENAME@', configuration: tools_conf, install: true, install_dir: bindir, @@ -244,7 +244,7 @@ configure_file( =20 configure_file( input: 'virt-pki-validate.in', - output: 'virt-pki-validate', + output: '@BASENAME@', configuration: tools_conf, install: true, install_dir: bindir, @@ -254,7 +254,7 @@ configure_file( if conf.has('WITH_SANLOCK') configure_file( input: 'virt-sanlock-cleanup.in', - output: 'virt-sanlock-cleanup', + output: '@BASENAME@', configuration: tools_conf, install: true, install_dir: sbindir, @@ -264,7 +264,7 @@ endif =20 configure_file( input: 'libvirt-guests.sh.in', - output: 'libvirt-guests.sh', + output: '@BASENAME@', configuration: tools_conf, install: true, install_dir: libexecdir, @@ -280,7 +280,7 @@ if init_script =3D=3D 'systemd' =20 configure_file( input: 'libvirt-guests.service.in', - output: 'libvirt-guests.service', + output: '@BASENAME@', configuration: tools_conf, install: true, install_dir: prefix / 'lib' / 'systemd' / 'system', --=20 2.26.2