From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8D6DBC76195 for ; Mon, 27 Mar 2023 09:25:12 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pgj60-0006JP-Av; Mon, 27 Mar 2023 05:24:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pgj5n-0006El-Ng for qemu-devel@nongnu.org; Mon, 27 Mar 2023 05:24:45 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pgj5l-0000XA-V2 for qemu-devel@nongnu.org; Mon, 27 Mar 2023 05:24:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679909080; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=pyUzI+ljH8PB4pamZap1D+7wLRtjNX25YFZZRPY2a3I=; b=bXSvNWdiTIVjOqbRUkIEuH/4PPbJNu/uI8L9VpfIrf3cqAVRMVYkyo2zsiAABs8tgPcftI vUya/p6IfM2MQiusxKPv3y90UkOxfm3cpMKl66knJ/TVLF5+TPB38IWauRuSJY0PXWw2P6 zEIS3F2w51D1gDRrOSK/qyHlIXlmJE4= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-439-mxB8j8-UPCmTgoj9lkpxkA-1; Mon, 27 Mar 2023 05:24:27 -0400 X-MC-Unique: mxB8j8-UPCmTgoj9lkpxkA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C279E38173CB for ; Mon, 27 Mar 2023 09:24:26 +0000 (UTC) Received: from redhat.com (unknown [10.33.36.173]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2F3F01121330; Mon, 27 Mar 2023 09:24:26 +0000 (UTC) Date: Mon, 27 Mar 2023 10:24:23 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: casantos@redhat.com Cc: qemu-devel@nongnu.org Subject: Re: [PATCH] meson: install keyboard maps only if necessary Message-ID: References: <20230326210427.66079-1-casantos@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20230326210427.66079-1-casantos@redhat.com> User-Agent: Mutt/2.2.9 (2022-11-12) X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Sun, Mar 26, 2023 at 06:04:27PM -0300, casantos@redhat.com wrote: > From: Carlos Santos > > They are required only for system emulation (i.e. have_system is true). > > Signed-off-by: Carlos Santos > --- > pc-bios/keymaps/meson.build | 6 ++++-- > scripts/meson-buildoptions.sh | 2 ++ > tests/fp/berkeley-testfloat-3 | 2 +- > ui/keycodemapdb | 2 +- You've got some git submodule updates included by accident here. > 4 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build > index 158a3b410c..bff3083313 100644 > --- a/pc-bios/keymaps/meson.build > +++ b/pc-bios/keymaps/meson.build > @@ -47,7 +47,7 @@ if native_qemu_keymap.found() > build_by_default: true, > output: km, > command: [native_qemu_keymap, '-f', '@OUTPUT@', args.split()], > - install: true, > + install: have_system, > install_dir: qemu_datadir / 'keymaps') > endforeach > > @@ -56,4 +56,6 @@ else > install_data(keymaps.keys(), install_dir: qemu_datadir / 'keymaps') > endif > > -install_data(['sl', 'sv'], install_dir: qemu_datadir / 'keymaps') > +if have_system > + install_data(['sl', 'sv'], install_dir: qemu_datadir / 'keymaps') > +endif > diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh > index 009fab1515..6eec7bc57f 100644 > --- a/scripts/meson-buildoptions.sh > +++ b/scripts/meson-buildoptions.sh > @@ -301,6 +301,8 @@ _meson_option_parse() { > --includedir=*) quote_sh "-Dincludedir=$2" ;; > --enable-install-blobs) printf "%s" -Dinstall_blobs=true ;; > --disable-install-blobs) printf "%s" -Dinstall_blobs=false ;; > + --enable-install-keymaps) printf "%s" -Dinstall_keymaps=true ;; > + --disable-install-keymaps) printf "%s" -Dinstall_keymaps=false ;; > --interp-prefix=*) quote_sh "-Dinterp_prefix=$2" ;; > --enable-jack) printf "%s" -Djack=enabled ;; > --disable-jack) printf "%s" -Djack=disabled ;; > diff --git a/tests/fp/berkeley-testfloat-3 b/tests/fp/berkeley-testfloat-3 > index 40619cbb3b..5a59dcec19 160000 > --- a/tests/fp/berkeley-testfloat-3 > +++ b/tests/fp/berkeley-testfloat-3 > @@ -1 +1 @@ > -Subproject commit 40619cbb3bf32872df8c53cc457039229428a263 > +Subproject commit 5a59dcec19327396a011a17fd924aed4fec416b3 > diff --git a/ui/keycodemapdb b/ui/keycodemapdb > index f5772a62ec..d21009b1c9 160000 > --- a/ui/keycodemapdb > +++ b/ui/keycodemapdb > @@ -1 +1 @@ > -Subproject commit f5772a62ec52591ff6870b7e8ef32482371f22c6 > +Subproject commit d21009b1c9f94b740ea66be8e48a1d8ad8124023 > -- > 2.31.1 > > With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|