From nobody Thu May 2 16:22:08 2024 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=1628611279; cv=none; d=zohomail.com; s=zohoarc; b=AFzSE9hDWayDYTyrV6hBJWB8qaTw3Q78+N2WJbiLxgulLFuEFMAI01yMEMLZoM+R6dmVe2iHItRP6SSAQM2L4mPP8v9eKRz7DKRmR1y7FNimhnk2OCkCexUVHNzmOp7X/kYpQio/jor1eoQdxBedxVS3aBbYOKuAjxxN8tPmASc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628611279; 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=h9v4T5Zt8vCGNS2Dw2f0SHORPQXUwsM8tnmAAFFgYzE=; b=IULhYp7iZQINxfrdytupdUcbwlgtTpDP+h0Z0Kh2/0oMi7AM/YdMMBqJYxMXjVK2OaEt52j8HAUN1+7GOECAbZSvvL+aiXgH3xtAORR1kvBTWxVLAPMZ7Hi7ZPrZ4VbeWgdfuq+hZyHEvhPrD7St2ZzPOQuLghziz7s8OBPt6s8= 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 1628611279602523.5564929021832; Tue, 10 Aug 2021 09:01:19 -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-258-pK7MeYsuOpStNfrgo3WQ_g-1; Tue, 10 Aug 2021 12:01:15 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 27E36801AE7; Tue, 10 Aug 2021 16:01:09 +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 03B0A28554; Tue, 10 Aug 2021 16:01:07 +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 4B067181A2A6; Tue, 10 Aug 2021 16:01:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17AFsY9d012498 for ; Tue, 10 Aug 2021 11:54:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id EF2D8669F3; Tue, 10 Aug 2021 15:54:34 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.194.144]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5D3E25D6CF for ; Tue, 10 Aug 2021 15:54:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628611278; 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=h9v4T5Zt8vCGNS2Dw2f0SHORPQXUwsM8tnmAAFFgYzE=; b=Au4L8Gu1Jiw1vtJgmsYwlcMOFIqQvSRwr0UpLSTdE8nXEwEqQnnUP8GkvJGKPR7CzlVRuq mdlqXcv3TjRkAmQ8pv8+yONd+o3Rtt83mLc3vZcLspOqaaGpfc6MGA6VJow00qm2Sqyw+J aZDpkDr/perTXTn38IPMyqpf6KlufnE= X-MC-Unique: pK7MeYsuOpStNfrgo3WQ_g-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH] meson: Always use the / operator to join paths Date: Tue, 10 Aug 2021 17:54:28 +0200 Message-Id: <20210810155428.75912-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com 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: 1628611289930100001 Content-Type: text/plain; charset="utf-8" This is the preferred way to do it, but there were a few instances in which some of the path components had embedded slashes instead. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- docs/internals/meson.build | 2 +- docs/kbase/meson.build | 2 +- docs/manpages/meson.build | 2 +- src/security/meson.build | 2 +- src/storage/meson.build | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/internals/meson.build b/docs/internals/meson.build index 5aa67ded5c..2d0ae6195c 100644 --- a/docs/internals/meson.build +++ b/docs/internals/meson.build @@ -12,7 +12,7 @@ html_xslt_gen =3D [] foreach name : internals_in_files html_xslt_gen +=3D { 'name': name, - 'source': 'docs/internals' / name + '.html.in', + 'source': 'docs' / 'internals' / name + '.html.in', } endforeach =20 diff --git a/docs/kbase/meson.build b/docs/kbase/meson.build index 8d8fd695ea..73dc11837f 100644 --- a/docs/kbase/meson.build +++ b/docs/kbase/meson.build @@ -31,7 +31,7 @@ foreach name : docs_kbase_files html_xslt_gen +=3D { 'name': name, 'file': docs_rst2html5_gen.process(rst_file), - 'source': 'docs/kbase' / rst_file, + 'source': 'docs' / 'kbase' / rst_file, } endforeach =20 diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build index fe91a43614..cafe29a545 100644 --- a/docs/manpages/meson.build +++ b/docs/manpages/meson.build @@ -125,7 +125,7 @@ foreach data : docs_man_files html_xslt_gen +=3D { 'name': data['name'], 'file': html_in, - 'source': 'docs/manpages' / rst_in_file, + 'source': 'docs' / 'manpages' / rst_in_file, } endforeach =20 diff --git a/src/security/meson.build b/src/security/meson.build index 6f5e1dec1d..6230b34aa4 100644 --- a/src/security/meson.build +++ b/src/security/meson.build @@ -47,7 +47,7 @@ if conf.has('WITH_LIBVIRTD') and conf.has('WITH_APPARMOR') conf_inc_dir, hypervisor_inc_dir, include_directories('.'), - include_directories('../storage_file'), + include_directories('..' / 'storage_file'), ], } endif diff --git a/src/storage/meson.build b/src/storage/meson.build index 915ae46f61..d1aa66b147 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -79,7 +79,7 @@ if conf.has('WITH_STORAGE') ], include_directories: [ conf_inc_dir, - include_directories('../storage_file'), + include_directories('..' / 'storage_file'), ], ) =20 @@ -163,7 +163,7 @@ if conf.has('WITH_STORAGE_GLUSTER') glusterfs_dep, ], 'include': [ - include_directories('../storage_file'), + include_directories('..' / 'storage_file'), ], 'install_dir': storage_backend_install_dir, } --=20 2.31.1