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 37EA1C4332F for ; Wed, 4 Jan 2023 16:48:32 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pD6w9-0006T0-Pv; Wed, 04 Jan 2023 11:48:21 -0500 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 1pD6w7-0006PI-OZ for qemu-devel@nongnu.org; Wed, 04 Jan 2023 11:48:19 -0500 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 1pD6w5-0001yV-E5 for qemu-devel@nongnu.org; Wed, 04 Jan 2023 11:48:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672850895; h=from:from: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; bh=v1Fk3+3TCIGEv94YACVWImh/c4q2TJs7f2t1FTOZE8M=; b=ZX09YcWDSShl+attPQAGbB7kPzlnD70RM8u/IZ+pYaSDMSI98Kr47Ig/7JkAjw2W0gnm1J LmbUmOAVKHrBjYZjOg5NiwTT7jZWY5xt5A3FONvr9/sITEBvY3a11WpbrWFKt/gV65uy3B uoeAYT7Y5R7OaMk9DZthO/Tsu5gDVBs= Received: from mail-ot1-f70.google.com (mail-ot1-f70.google.com [209.85.210.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-441-4Bk-_0G9Pbq8vkedujCwpA-1; Wed, 04 Jan 2023 11:48:14 -0500 X-MC-Unique: 4Bk-_0G9Pbq8vkedujCwpA-1 Received: by mail-ot1-f70.google.com with SMTP id f39-20020a9d03aa000000b006705c6992daso17872771otf.14 for ; Wed, 04 Jan 2023 08:48:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=v1Fk3+3TCIGEv94YACVWImh/c4q2TJs7f2t1FTOZE8M=; b=MDEmfMj5Os7ne0DWo6d2JZEe2sIzOwaNxTKVbw1GPeQw+tI9TRGN4SKfVomWR3+STd oW4QUiB2Y0Nhhnr2ccdffl0MDmlDBwijn72SUrC/U0l5JXddITeSEAIY9Lzyc40H/mD8 6t5oRIbLhZkXU2ZR6hhe85zc1wX6eWddo45kv4ZeY+vfEetPBPcufWnh2+FHc4iM/DC+ gDrdM+O3Srsa3Z3O1AuqcNTh1D0AJDKYeCOugN1McAiZoyAYYUzoSDVE97dEW3j3KiNx tOScnApWvkKmvuUP7nt1dKJegElF2ezha5EQlPUXa8Kn3NHQ0LlwLFdlmSCpN3Hl1Tsa sSXQ== X-Gm-Message-State: AFqh2kpxBLSBjd/B6MqumTX7CK8B4PZx5fb/M2j4v8+poClxWzHWk8hl HZD7baOKZZwECd3MkJbALl/ndxUDs+5CzLxv6Zhqx6fIbWgfM11UihgnMgvRj4qrJtyCGHwyWmM HQuccQQtRlvJrg2lGeDFGVVyX6xIuKHw= X-Received: by 2002:a05:6870:468d:b0:144:1ba:d778 with SMTP id a13-20020a056870468d00b0014401bad778mr3004281oap.170.1672850893463; Wed, 04 Jan 2023 08:48:13 -0800 (PST) X-Google-Smtp-Source: AMrXdXt00h9Vw1F7xjxJhrEVOeliX8j4n6mEVBPWCnLaFrbVfGxH6M9Bkw81Sjn7AP5DqVLd/Fnpj9BH5xzPZX2+MZY= X-Received: by 2002:a05:6870:468d:b0:144:1ba:d778 with SMTP id a13-20020a056870468d00b0014401bad778mr3004279oap.170.1672850893198; Wed, 04 Jan 2023 08:48:13 -0800 (PST) MIME-Version: 1.0 References: <20230102161903.3857354-1-casantos@redhat.com> <4c891001-4744-c174-7459-d13903037990@linaro.org> In-Reply-To: <4c891001-4744-c174-7459-d13903037990@linaro.org> From: Carlos Santos Date: Wed, 4 Jan 2023 13:48:02 -0300 Message-ID: Subject: Re: [PATCH] meson: allow disablind the installation of keymaps To: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= Cc: qemu-devel@nongnu.org, qemu-trivial@nongnu.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=170.10.129.124; envelope-from=casantos@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Wed, Jan 4, 2023 at 12:15 PM Philippe Mathieu-Daud=C3=A9 wrote: > > On 4/1/23 15:49, Carlos Santos wrote: > > On Mon, Jan 2, 2023 at 1:19 PM wrote: > >> > >> From: Carlos Santos > >> > >> There are situatuions in which the keyboard maps are not necessary (e.= g. > >> when building only tools or linux-user emulator). Add an option to avo= id > >> installing them, as already possible to do with firmware blobs. > >> > >> Signed-off-by: Carlos Santos > >> --- > >> configure | 2 ++ > >> meson_options.txt | 2 ++ > >> pc-bios/keymaps/meson.build | 6 ++++-- > >> scripts/meson-buildoptions.sh | 4 ++++ > >> 4 files changed, 12 insertions(+), 2 deletions(-) > >> > >> diff --git a/configure b/configure > >> index 789a4f6cc9..c6ed6a23d0 100755 > >> --- a/configure > >> +++ b/configure > >> @@ -889,6 +889,8 @@ for opt do > >> ;; > >> --disable-blobs) meson_option_parse --disable-install-blobs "" > >> ;; > >> + --disable-keymaps) meson_option_parse --disable-install-keymaps "" > >> + ;; > >> --enable-vfio-user-server) vfio_user_server=3D"enabled" > >> ;; > >> --disable-vfio-user-server) vfio_user_server=3D"disabled" > >> diff --git a/meson_options.txt b/meson_options.txt > >> index 559a571b6b..be27137e98 100644 > >> --- a/meson_options.txt > >> +++ b/meson_options.txt > >> @@ -48,6 +48,8 @@ option('module_upgrades', type : 'boolean', value : = false, > >> description: 'try to load modules from alternate paths for up= grades') > >> option('install_blobs', type : 'boolean', value : true, > >> description: 'install provided firmware blobs') > >> +option('install_keymaps', type : 'boolean', value : true, > >> + description: 'install provided keyboard maps') > >> option('sparse', type : 'feature', value : 'auto', > >> description: 'sparse checker') > >> option('guest_agent', type : 'feature', value : 'auto', > >> diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build > >> index 06c75e646b..7d80c23005 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: get_option('install_keymaps'), > >> 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 get_option('install_keymaps') > >> + install_data(['sl', 'sv'], install_dir: qemu_datadir / 'keymaps') > >> +endif > >> diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoption= s.sh > >> index aa6e30ea91..f17d9c196e 100644 > >> --- a/scripts/meson-buildoptions.sh > >> +++ b/scripts/meson-buildoptions.sh > >> @@ -11,6 +11,8 @@ meson_options_help() { > >> printf "%s\n" ' --datadir=3DVALUE Data file directory [s= hare]' > >> printf "%s\n" ' --disable-coroutine-pool coroutine freelist (bett= er performance)' > >> printf "%s\n" ' --disable-install-blobs install provided firmwar= e blobs' > >> + printf "%s\n" ' --disable-install-keymaps' > >> + printf "%s\n" ' install provided keyboard= maps' > >> printf "%s\n" ' --docdir=3DVALUE Base directory for doc= umentation installation' > >> printf "%s\n" ' (can be empty) [share/do= c]' > >> printf "%s\n" ' --enable-block-drv-whitelist-in-tools' > >> @@ -291,6 +293,8 @@ _meson_option_parse() { > >> --includedir=3D*) quote_sh "-Dincludedir=3D$2" ;; > >> --enable-install-blobs) printf "%s" -Dinstall_blobs=3Dtrue ;; > >> --disable-install-blobs) printf "%s" -Dinstall_blobs=3Dfalse ;; > >> + --enable-install-keymaps) printf "%s" -Dinstall_keymaps=3Dtrue ;; > >> + --disable-install-keymaps) printf "%s" -Dinstall_keymaps=3Dfalse = ;; > >> --interp-prefix=3D*) quote_sh "-Dinterp_prefix=3D$2" ;; > >> --enable-jack) printf "%s" -Djack=3Denabled ;; > >> --disable-jack) printf "%s" -Djack=3Ddisabled ;; > >> -- > >> 2.31.1 > >> > > > > Thinking a bit more about this patch, I think the correct approach > > would be to install blobs and keymaps depending on have_system: > > > > [...] > > install: have_system, > > [...] > > > > And use the same approach for trace-events-all, in trace/meson.build: > > > > [...] > > install: have_linux_user or have_bsd_user or have_system, > > [...] > > > > This would prevent installing useless data. > > Yes, similar to: > https://lore.kernel.org/qemu-devel/20210323155132.238193-1-f4bug@amsat.or= g/ > Apparently it was reviewed and ack-ed but never applied. :-( --=20 Carlos Santos Senior Software Maintenance Engineer Red Hat casantos@redhat.com T: +55-11-3534-6186