From nobody Tue Feb 10 14:49: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=1681732476; cv=none; d=zohomail.com; s=zohoarc; b=N8E3DS62BCwW/2t2gAZd/Y5QzTBRVTXQUZCIaXneFJt0k2GUsJndD82kSHVp2MQpHQn4VBQGyMWgF/sjEZbCpLB8ixWPSjvut+kUQnxUlphw4mE1HH3gJPFy1JR17BIP4oh6roa+1KmoOSZHBG42Z6nDbOn5UkhtvnVeYUaBAdw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681732476; h=Content-Type:Content-Transfer-Encoding:Cc: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=E79kfnMBf43IvZnD1m55+IZNtMSFXCYD1HDe8mapwi8=; b=XdVNgUIUM6yy1WfS/Dq6r06MA/4NYh6bgp1BhRPzRpioW5eqHmauDx+EdSC37m5RQ5qls9UhOpYGcrixt+XfATzFfDFzDWv62Eb5bv9bCZC4N+BciyjH3E6nWrLsedrt36DnhvMFNOIHnKXmOSgw0ZjTI4z8kl4PhHoiPuViq7w= 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 1681732476079899.6952321184899; Mon, 17 Apr 2023 04:54:36 -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-98-r_JNzi8CPRGhwfp-YdwB3w-1; Mon, 17 Apr 2023 07:54:33 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 434A28996F4; Mon, 17 Apr 2023 11:54:31 +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 2F75F492B0C; Mon, 17 Apr 2023 11:54:31 +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 F3E4919465A4; Mon, 17 Apr 2023 11:54:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id AF969194658C for ; Mon, 17 Apr 2023 11:54:29 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 93A6F492B0D; Mon, 17 Apr 2023 11:54:29 +0000 (UTC) Received: from localhost (unknown [10.39.208.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id C0F48492B0C; Mon, 17 Apr 2023 11:54:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681732475; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=E79kfnMBf43IvZnD1m55+IZNtMSFXCYD1HDe8mapwi8=; b=hTPM+5QxFW1dcUy9n3ntnbLtLTfXqZgaX6OEFIVJ9abJI4YSlF3OqdK/xT6nbiGqSvDKJf F9Q1rjw4MeJt9feROvIr3OuZ3TSmcBVVXFeMMpNGUSbAOB6KmVh5UEZMcpsTxz7APBtLDV fNksHHxvcPZkHt5N4g7t8jAq2fwn//0= X-MC-Unique: r_JNzi8CPRGhwfp-YdwB3w-1 X-Original-To: libvir-list@listman.corp.redhat.com From: marcandre.lureau@redhat.com To: libvir-list@redhat.com Subject: [libvirt PATCH v2 6/6] Move src/keycodemapdb -> subprojects/keycodemapdb Date: Mon, 17 Apr 2023 15:54:01 +0400 Message-Id: <20230417115401.327720-7-marcandre.lureau@redhat.com> In-Reply-To: <20230417115401.327720-1-marcandre.lureau@redhat.com> References: <20230417115401.327720-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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: , Cc: mprivozn@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1681732478452100001 From: Marc-Andr=C3=A9 Lureau Follow better meson build system conventions. This allows to find keymap-gen or CSV without explicitly setting the paths. Signed-off-by: Marc-Andr=C3=A9 Lureau --- .gitmodules | 2 +- meson.build | 1 + src/util/meson.build | 4 ++-- {src =3D> subprojects}/keycodemapdb | 0 4 files changed, 4 insertions(+), 3 deletions(-) rename {src =3D> subprojects}/keycodemapdb (100%) diff --git a/.gitmodules b/.gitmodules index 79b7e19485..7bee617505 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "keycodemapdb"] - path =3D src/keycodemapdb + path =3D subprojects/keycodemapdb url =3D https://gitlab.com/keycodemap/keycodemapdb.git diff --git a/meson.build b/meson.build index f7f31a278d..de087666f5 100644 --- a/meson.build +++ b/meson.build @@ -2028,6 +2028,7 @@ runutf8 =3D [ 'LC_ALL=3D', 'LANG=3DC', 'LC_CTYPE=3Den= _US.UTF-8' ] =20 top_inc_dir =3D include_directories('.') =20 +keycodemapdb =3D subproject('keycodemapdb') =20 # include remaining subdirs =20 diff --git a/src/util/meson.build b/src/util/meson.build index c6b1294f24..c2175f1098 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -138,8 +138,8 @@ keyname_list =3D [ 'win32', ] =20 -keymap_gen_prog =3D find_program('keymap-gen', dirs: [meson.project_source= _root() / 'src' / 'keycodemapdb' / 'tools' ]) -keymap_src_file =3D '@0@/src/keycodemapdb/data/keymaps.csv'.format(meson.p= roject_source_root()) +keymap_gen_prog =3D find_program('keymap-gen') +keymap_src_file =3D keycodemapdb.get_variable('keymaps_csv') =20 foreach name : keycode_list keycode_gen_sources +=3D custom_target( diff --git a/src/keycodemapdb b/subprojects/keycodemapdb similarity index 100% rename from src/keycodemapdb rename to subprojects/keycodemapdb --=20 2.40.0