From nobody Fri May 17 03:12:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598026140; cv=none; d=zohomail.com; s=zohoarc; b=CA38pPqGNy8n4CcMgM2vzGr5ire/RFf9QlOng2K8qjUONPVh1nwy6WaQPR0ZJ2Nk6O5f6Zwn8/VOHft42By0/kZ4dJIlgvxJli8Hv6R/dKufK/g2MrqzdXLfQf7vhJw3FofK5i/Q99ioFCN0caRz+3EP2N5QXMd1G/+Ogw2xkO4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598026140; 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=RP5sPC0tUjDqZWFgnQ62rHS0udPhxfzeGhIvY/Ua/6Q=; b=aQ0Ofn5AQE3gWsCqEnpTULmlftqVOMZ3YXOolhs/ZtcMuAaF3X0g4XdIYeJPtwZD8HqozpDYlXpjcE9LMn/fX7YZOYa7nef5yrmWwdGXYNj4FoiCbQ46Vh0RMfMkRMmmD/ql7MQUnSkBJSeApr913nxh6XHAfyt3PgRvj+aKOfU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598026140003931.6930507611663; Fri, 21 Aug 2020 09:09:00 -0700 (PDT) Received: from localhost ([::1]:35402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k99b8-0002HZ-Gn for importer@patchew.org; Fri, 21 Aug 2020 12:08:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55082) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k99aJ-0000yP-At for qemu-devel@nongnu.org; Fri, 21 Aug 2020 12:08:07 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:55717 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k99aH-0003cj-7O for qemu-devel@nongnu.org; Fri, 21 Aug 2020 12:08:07 -0400 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-359-tof4ThsLMc2oxrM858F90w-1; Fri, 21 Aug 2020 12:08:02 -0400 Received: by mail-wr1-f70.google.com with SMTP id r14so691246wrq.3 for ; Fri, 21 Aug 2020 09:08:02 -0700 (PDT) Received: from localhost.localdomain (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id z207sm7143815wmc.2.2020.08.21.09.07.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Aug 2020 09:07:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598026083; 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=RP5sPC0tUjDqZWFgnQ62rHS0udPhxfzeGhIvY/Ua/6Q=; b=eqRJs4zPDKZEFCRBEOGhP9tKiGO8uMI7VP5SkXml91Uj/cv+mYF5JqZF3gx1K7zsh75ZAm tVwitsm9n42HqHUfUN2lc6RcEFKbM1ulJKc2DxzprHWQUNkNmwOx/9Mpf9I4f23VSmShL0 /gft/4ZnXHouX/lwJzKGK7BxPEMpbNo= X-MC-Unique: tof4ThsLMc2oxrM858F90w-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RP5sPC0tUjDqZWFgnQ62rHS0udPhxfzeGhIvY/Ua/6Q=; b=I/VsbIGhCNrM5hrrkgdfv1xTZ9x1d8iqw6DfZ4rvfT5UBcyx9wAbGczD+rNlpYMiOR BRfP9d+JxYeRncYWQX+/h6pTibX6zebnJbFFNzd8dfyQeWg/uG+DeH/nsaBWSc3UfgqI GS4S78KbC+fgrWk53xK1S4b2pCO1PXYCC4iI4woohRok5ae9oHar178fos0HwK1pwiU5 LAeDc144fbjt+9YEWsDJKgW8j15pM+FgCYRs3rq7+wAlHNadnN5cDjeMdkmt5F8PrY/8 /z2ECUWBIctj5YhYnY0aoIpELh/8ocHhXexGc0Pq04nTRMsefpbHgYEvjijgj8d64fVj fmkQ== X-Gm-Message-State: AOAM533E9gQ+DUktioDl9JkB45JXnArZXTDrpGXOwXvDCF/oAxVXZBUp DZQlW/TOpnOSgoKayAHIoN+zyYP5kcgY7oh6jyt3LpnfroHBw9HL3vitSvmTalfXIbi2QAtvims ULxbmrhZCApkXum8= X-Received: by 2002:a1c:e302:: with SMTP id a2mr4670015wmh.110.1598026080797; Fri, 21 Aug 2020 09:08:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyA2Oc5bGbW3zMjp5IOoRtpgyX0fmAw7kXwa+aFRtjvEJu1oqMVaVvblfjqWUK2YGxaFfdq+g== X-Received: by 2002:a1c:e302:: with SMTP id a2mr4669994wmh.110.1598026080577; Fri, 21 Aug 2020 09:08:00 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 1/2] meson: convert pc-bios/keymaps/Makefile Date: Fri, 21 Aug 2020 18:07:51 +0200 Message-Id: <20200821160752.1254102-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200821160752.1254102-1-philmd@redhat.com> References: <20200821160752.1254102-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/21 04:55:47 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Makefile | 8 ------ pc-bios/keymaps/Makefile | 56 ------------------------------------- pc-bios/keymaps/meson.build | 56 +++++++++++++++++++++++++++++++++++++ pc-bios/meson.build | 1 + 4 files changed, 57 insertions(+), 64 deletions(-) delete mode 100644 pc-bios/keymaps/Makefile create mode 100644 pc-bios/keymaps/meson.build diff --git a/Makefile b/Makefile index 8373ddccc93..ef28ce0361d 100644 --- a/Makefile +++ b/Makefile @@ -229,11 +229,6 @@ distclean: clean ninja-distclean rm -f linux-headers/asm rm -Rf .sdk =20 -KEYMAPS=3Dda en-gb et fr fr-ch is lt no pt-br sv \ -ar de en-us fi fr-be hr it lv nl pl ru th \ -de-ch es fo fr-ca hu ja mk pt sl tr \ -bepo cz - ifdef INSTALL_BLOBS BLOBS=3Dbios.bin bios-256k.bin bios-microvm.bin sgabios.bin vgabios.bin vg= abios-cirrus.bin \ vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin vgabios-virtio.bin \ @@ -298,9 +293,6 @@ endif $(INSTALL_DATA) $(SRC_PATH)/ui/qemu.desktop \ "$(DESTDIR)$(qemu_desktopdir)/qemu.desktop" $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps" - set -e; for x in $(KEYMAPS); do \ - $(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadi= r)/keymaps"; \ - done =20 ifdef CONFIG_WIN32 =20 diff --git a/pc-bios/keymaps/Makefile b/pc-bios/keymaps/Makefile deleted file mode 100644 index 76217b06896..00000000000 --- a/pc-bios/keymaps/Makefile +++ /dev/null @@ -1,56 +0,0 @@ - -KEYMAP :=3D $(shell which qemu-keymap 2>/dev/null) - -MAPS :=3D ar bepo cz da de de-ch en-us en-gb es et fi fo \ - fr fr-be fr-ca fr-ch \ - hr hu is it ja lt lv mk nl no pl pt pt-br ru th tr - -ar : MAP_FLAGS :=3D -l ar -bepo : MAP_FLAGS :=3D -l fr -v dvorak -cz : MAP_FLAGS :=3D -l cz -da : MAP_FLAGS :=3D -l dk -de : MAP_FLAGS :=3D -l de -v nodeadkeys -de-ch : MAP_FLAGS :=3D -l ch -en-us : MAP_FLAGS :=3D -l us -en-gb : MAP_FLAGS :=3D -l gb -es : MAP_FLAGS :=3D -l es -et : MAP_FLAGS :=3D -l et -fi : MAP_FLAGS :=3D -l fi -fo : MAP_FLAGS :=3D -l fo -fr : MAP_FLAGS :=3D -l fr -v nodeadkeys -fr-be : MAP_FLAGS :=3D -l be -fr-ca : MAP_FLAGS :=3D -l ca -v fr -fr-ch : MAP_FLAGS :=3D -l ch -v fr -hr : MAP_FLAGS :=3D -l hr -hu : MAP_FLAGS :=3D -l hu -is : MAP_FLAGS :=3D -l is -it : MAP_FLAGS :=3D -l it -ja : MAP_FLAGS :=3D -l jp -m jp106 -lt : MAP_FLAGS :=3D -l lt -lv : MAP_FLAGS :=3D -l lv -mk : MAP_FLAGS :=3D -l mk -nl : MAP_FLAGS :=3D -l nl -no : MAP_FLAGS :=3D -l no -pl : MAP_FLAGS :=3D -l pl -pt : MAP_FLAGS :=3D -l pt -pt-br : MAP_FLAGS :=3D -l br -ru : MAP_FLAGS :=3D -l ru -th : MAP_FLAGS :=3D -l th -tr : MAP_FLAGS :=3D -l tr - -ifeq ($(KEYMAP),) - -all: - @echo "nothing to do (qemu-keymap not found)" - -else - -all: $(MAPS) - -clean: - rm -f $(MAPS) - -$(MAPS): $(KEYMAP) Makefile - $(KEYMAP) -f $@ $(MAP_FLAGS) - -endif diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build new file mode 100644 index 00000000000..06fc79b9b3f --- /dev/null +++ b/pc-bios/keymaps/meson.build @@ -0,0 +1,56 @@ +keymaps =3D { + 'ar': '-l ar', + 'bepo': '-l fr -v dvorak', + 'cz': '-l cz', + 'da': '-l dk', + 'de': '-l de -v nodeadkeys', + 'de-ch': '-l ch', + 'en-gb': '-l us', + 'en-us': '-l gb', + 'es': '-l es', + 'et': '-l et', + 'fi': '-l fi', + 'fo': '-l fo', + 'fr': '-l fr -v nodeadkeys', + 'fr-be': '-l be', + 'fr-ca': '-l ca -v fr', + 'fr-ch': '-l ch -v fr', + 'hr': '-l hr', + 'hu': '-l hu', + 'is': '-l is', + 'it': '-l it', + 'ja': '-l jp -m jp106', + 'lt': '-l lt', + 'lv': '-l lv', + 'mk': '-l mk', + 'nl': '-l nl', + 'no': '-l no', + 'pl': '-l pl', + 'pt': '-l pt', + 'pt-br': '-l br', + 'ru': '-l ru', + 'sl': '', + 'sv': '', + 'th': '-l th', + 'tr': '-l tr', +} + +if meson.is_cross_build() or 'CONFIG_XKBCOMMON' in config_host + native_qemu_keymap =3D find_program('qemu-keymap', required: false, disa= bler: true) +else + native_qemu_keymap =3D qemu_keymap +endif +t =3D [] +foreach km, args: keymaps + t +=3D custom_target(km, + build_by_default: true, + output: km, + command: [native_qemu_keymap, '-f', '@OUTPUT@', args.= split()], + install_dir: config_host['qemu_datadir'] / 'keymaps') +endforeach +if t.length() > 0 + alias_target('update-keymaps', t) +else + # install from the source tree + install_data(keymaps.keys(), install_dir: config_host['qemu_datadir'] / = 'keymaps') +endif diff --git a/pc-bios/meson.build b/pc-bios/meson.build index 6e3bfe3ca4e..b6389f5148d 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -25,3 +25,4 @@ if 'DECOMPRESS_EDK2_BLOBS' in config_host endif =20 subdir('descriptors') +subdir('keymaps') --=20 2.26.2 From nobody Fri May 17 03:12:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598026145; cv=none; d=zohomail.com; s=zohoarc; b=dg0TntVLKL5Fis0bAuI/ePs1d6O4iYq/NX3xX6hBrCDmOzzxg3Ow/Qf/oJQLt76+NXgKmbO648/S2pZQRFZqOXR46Qe4B2HecAaMVRZUnRR4O/wdIKgdjrnmdorFc5kjaaEiqyJuJM2uGnmbOWqWdfmbo8TQDx4plcc0hzYYfSA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598026145; 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=QNLCUycU+nWEXithWdbVY34QeWXma92nS9kZQp9Eokg=; b=hN9jsZ31pMQt9RDfHur9dqCXU06TGAP2IyeuMgyQONu73mirgQY6m8DDOj4YMiAyiq22ectNYJFvThmTAXnwXh5BjbRNg4x1yUL2YWCwov/fuN87vaw+wa3hT+Elob2CV4Kz2jDvFF7VZxUWCttnB8QZB4bPZJaQYdR4NwibBiI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598026145444944.5167117989838; Fri, 21 Aug 2020 09:09:05 -0700 (PDT) Received: from localhost ([::1]:35886 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k99bE-0002TN-3A for importer@patchew.org; Fri, 21 Aug 2020 12:09:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55116) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k99aO-00019g-BY for qemu-devel@nongnu.org; Fri, 21 Aug 2020 12:08:12 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:50897) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k99aM-0003dL-Ft for qemu-devel@nongnu.org; Fri, 21 Aug 2020 12:08:11 -0400 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-476-rXkbfj3lPxuhkLm_BUiIOg-1; Fri, 21 Aug 2020 12:08:07 -0400 Received: by mail-wr1-f70.google.com with SMTP id s23so684123wrb.12 for ; Fri, 21 Aug 2020 09:08:07 -0700 (PDT) Received: from localhost.localdomain (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id v7sm5873634wmj.28.2020.08.21.09.08.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Aug 2020 09:08:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598026089; 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=QNLCUycU+nWEXithWdbVY34QeWXma92nS9kZQp9Eokg=; b=Ou4I0+AQzxUXDhtYRKdPk0yigzhCflbQRH3Z8P3Ty7k/hwfR4bF+UYMgd+ZwtXxIFtuikE sGrMPjAGN0OBCGoUyKb6fRQjHUm42NE+klf/N2AGdT7uouT7d6aYG8xvl0ho8oXRYxyexf 3VucyQWquaXTW4WrqG+bKO7310Mp08U= X-MC-Unique: rXkbfj3lPxuhkLm_BUiIOg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QNLCUycU+nWEXithWdbVY34QeWXma92nS9kZQp9Eokg=; b=KXh+UZOBHW4pNwSiVGb7FpHuw1t3iAXyUmoKx5m2zaBOZWYbvnXtYWgZ1aTCzTH0Ss xAwpQe0cEtzeWvoEH7kOq+w3rodIQDCJTNBrOOXzVLFa1zQoWGfYaMNFhqTAvpH9I1NN ioCsVO+uM+6vspCM50KHMURXWGkRTFjqjIELlD7JtW1SRMamRfsJOGLgs5TybwUmxrYm Oi3KRpSgO+3bU/qNoLyni/VcHy4X68FijC1HgZ8tkKggDD6ZLYN8L2lP3A+OKQCwalWY O74SzIJODTFIJ6bHeH2v68ignAqlvHehV/Znq8OGLxxTHdzEDvY+NQcYAhLjw+Qih89j pARQ== X-Gm-Message-State: AOAM5302w9vN0RXSuHR0iPkZO0pVPk3H5MQFaFEilg0RohY/Bp7OCIbo bbbJ61FoVXUQWozaGhz8c6BvIn8cxCVOYu5S5lPT87it3hKnLFArZ0UVEgqP0iEpMCCYwdSIV0/ Cmvhp06aB0JQJT8s= X-Received: by 2002:adf:df85:: with SMTP id z5mr3244730wrl.267.1598026085648; Fri, 21 Aug 2020 09:08:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJybqY1gGLQxCIOVCTy4zsJkdmERZpYNG0uZJ2XZkMC5DYJEPlK0QBmd9Ywe/7r5THwGFp64pg== X-Received: by 2002:adf:df85:: with SMTP id z5mr3244718wrl.267.1598026085481; Fri, 21 Aug 2020 09:08:05 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 2/2] meson: Do not consider qemu-keymap a 'tool' Date: Fri, 21 Aug 2020 18:07:52 +0200 Message-Id: <20200821160752.1254102-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200821160752.1254102-1-philmd@redhat.com> References: <20200821160752.1254102-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/21 02:43:55 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) We need qemu-keymap to generate the keymaps. This fixes when configuring with --disable-tools: Compiling C object qemu-keymap.p/qemu-keymap.c.o Compiling C object qemu-keymap.p/ui_input-keymap.c.o Compiling C object qemu-edid.p/qemu-edid.c.o ../ui/input-keymap.c:7:49: fatal error: ui/input-keymap-atset1-to-qcode.c= .inc: No such file or directory compilation terminated. Makefile.ninja:688: recipe for target 'qemu-keymap.p/ui_input-keymap.c.o'= failed make: *** [qemu-keymap.p/ui_input-keymap.c.o] Error 1 Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- v3: Rebased on Marc-Andr=C3=A9 keymap patch Paolo feel free to improve the subject if qemu-keymap is a tool :) --- meson.build | 11 ++++++----- ui/meson.build | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 808f50b07ef..dd8016c9da3 100644 --- a/meson.build +++ b/meson.build @@ -1062,6 +1062,12 @@ if 'CONFIG_GUEST_AGENT' in config_host subdir('qga') endif =20 +if 'CONFIG_XKBCOMMON' in config_host + # used for the update-keymaps target, so include rules even if !have_too= ls + qemu_keymap =3D executable('qemu-keymap', files('qemu-keymap.c', 'ui/inp= ut-keymap.c') + genh, + dependencies: [qemuutil, xkbcommon], install: h= ave_tools) +endif + if have_tools qemu_img =3D executable('qemu-img', [files('qemu-img.c'), hxdep], dependencies: [authz, block, crypto, io, qom, qemuutil], inst= all: true) @@ -1078,11 +1084,6 @@ if have_tools subdir('contrib/rdmacm-mux') subdir('contrib/elf2dmp') =20 - if 'CONFIG_XKBCOMMON' in config_host - executable('qemu-keymap', files('qemu-keymap.c', 'ui/input-keymap.c'), - dependencies: [qemuutil, xkbcommon], install: true) - endif - executable('qemu-edid', files('qemu-edid.c', 'hw/display/edid-generate.c= '), dependencies: qemuutil, install: true) diff --git a/ui/meson.build b/ui/meson.build index 6f74d30ea06..6bf398213f3 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -95,7 +95,7 @@ keymaps =3D [ ['osx', 'qcode'], ] =20 -if have_system +if have_system or have_tools foreach e : keymaps output =3D 'input-keymap-@0@-to-@1@.c.inc'.format(e[0], e[1]) genh +=3D custom_target(output, --=20 2.26.2