From nobody Sat May 18 21:00:31 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=1598524050; cv=none; d=zohomail.com; s=zohoarc; b=cHqsKoO3U1WM4cYm9NLH6mixpsHOR3Vf+Zx8aWyAfKQRWUjqpIZIFwKnCg9PK1N24Dt9CpVdi5BqSA5E3l0PsafWc5K72HESSdzJM2WANuMNjCxqQIcPi2M3tYKmjRkUSBEKEvj6u0CziMMyD+ZFI2p8h7kAnZ3Ad2OgXW2gsBY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598524050; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=kQD9S08pmk0/yxZ7AMs+abBIbMg0NLRVHkw0V2BGGJs=; b=eIfNMGsj7Qh6cgfla6a5Wi7msaFR8egDBARtTUQByTYCBcSWNaLLRlqD3iFKC/mQFTz/f8nJh3t81BkHZYkiRIBRvcEHW5shZtbGVexStuTQIecqssHVFmQqHD9UF4/NN6wCYNf7nozaso/+t7iMwBuzhLQeO/Rf91eL15yHE0Y= 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 1598524050057293.8311294260757; Thu, 27 Aug 2020 03:27:30 -0700 (PDT) Received: from localhost ([::1]:45590 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBF7v-0007jc-GZ for importer@patchew.org; Thu, 27 Aug 2020 06:27:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42660) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBF6y-0006sB-Qj for qemu-devel@nongnu.org; Thu, 27 Aug 2020 06:26:28 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:48845 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 1kBF6w-0002xY-K4 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 06:26:28 -0400 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-23-p4Pz0Q0HOkiwjBWjHIjT1Q-1; Thu, 27 Aug 2020 06:26:23 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1F15485C708 for ; Thu, 27 Aug 2020 10:26:22 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-54.ams2.redhat.com [10.36.112.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1C189776E8; Thu, 27 Aug 2020 10:26:19 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 12932991; Thu, 27 Aug 2020 12:26:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598523984; 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; bh=kQD9S08pmk0/yxZ7AMs+abBIbMg0NLRVHkw0V2BGGJs=; b=Lawe+AqTstdkDvvH9dHtFi1mTpjMlOSuhmibNCXyeM+pbATuu+yz+Du7q7lOQ7Jh5Lx5Z7 /3DEnluPtnK+yMAbsuQNiGnVk52drJRzivkbsUxp0emJSamzI3cxpNKjoelw+bwxJ6PwTZ dUpdYLy7qBHhU1NFe4OgcVg8UX4QAuU= X-MC-Unique: p4Pz0Q0HOkiwjBWjHIjT1Q-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH] meson: fix keymaps witout qemu-keymap Date: Thu, 27 Aug 2020 12:26:17 +0200 Message-Id: <20200827102617.14448-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com 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=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:56:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" In case the qemu-keymap tool generating them is neither installed on the system nor built from sources (due to xkbcommon not being available) qemu will not find the keymaps when started directly from the build tree, This happens because commit ddcf607fa3d6 ("meson: drop keymaps symlink") removed the symlink to the source tree, and the special handling for install doesn't help in case we do not install qemu. Lets fix that by simply copying over the file from the source tree as fallback. Reported-by: Thomas Huth Signed-off-by: Gerd Hoffmann Tested-by: Thomas Huth --- pc-bios/keymaps/meson.build | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build index b737c8223031..e102dd56b454 100644 --- a/pc-bios/keymaps/meson.build +++ b/pc-bios/keymaps/meson.build @@ -38,19 +38,29 @@ if meson.is_cross_build() or 'CONFIG_XKBCOMMON' not in = config_host 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') + if native_qemu_keymap.found() + # generate with qemu-kvm + t +=3D custom_target(km, + build_by_default: true, + output: km, + command: [native_qemu_keymap, '-f', '@OUTPUT@', arg= s.split()], + install_dir: config_host['qemu_datadir'] / 'keymaps= ') + else + # copy from source tree + t +=3D custom_target(km, + build_by_default: true, + input: km, + output: km, + command: ['cp', '@INPUT@', '@OUTPUT@'], + install_dir: config_host['qemu_datadir'] / 'keymaps= ') + endif endforeach -if t.length() > 0 + +if native_qemu_keymap.found() alias_target('update-keymaps', t) -else - # install from the source tree - install_data(keymaps.keys(), install_dir: config_host['qemu_datadir'] / = 'keymaps') endif =20 install_data(['sl', 'sv'], install_dir: config_host['qemu_datadir'] / 'key= maps') --=20 2.27.0