From patchwork Tue May 23 23:16:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1785458 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QQqvy103zz20PY for ; Wed, 24 May 2023 09:17:00 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 2A58941DCC; Tue, 23 May 2023 23:16:58 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 2A58941DCC X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mR5E6HiI7Ivf; Tue, 23 May 2023 23:16:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 2EA23404CA; Tue, 23 May 2023 23:16:56 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 2EA23404CA X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id A16981BF369 for ; Tue, 23 May 2023 23:16:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 82E4F41EA4 for ; Tue, 23 May 2023 23:16:54 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 82E4F41EA4 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jQ61-XdMPZJI for ; Tue, 23 May 2023 23:16:53 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 3FDAE41E8D Received: from mail-oo1-xc29.google.com (mail-oo1-xc29.google.com [IPv6:2607:f8b0:4864:20::c29]) by smtp4.osuosl.org (Postfix) with ESMTPS id 3FDAE41E8D for ; Tue, 23 May 2023 23:16:53 +0000 (UTC) Received: by mail-oo1-xc29.google.com with SMTP id 006d021491bc7-5552a0a9557so338749eaf.0 for ; Tue, 23 May 2023 16:16:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684883812; x=1687475812; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=TWEGpuhGN/aT+B6FKb1dUZp0/wmxtQGWYHCzEOHXAWc=; b=Y5+Z8IPF941p9XDvrRZMFdq4wbgd94oil+lCX+oyIdUL9l5lRjd5jtiPf7uMaqwIhz ZZFPsHSI9SPUa6na/5hbrH/oAyWJEQ5avsOVRc4TlNGUCBwpiGMQ7VcGEkI+QV/QRYXn 2Ee7GrBOZW7es0iDx7U7YejoUS/hzznFJojKs+5dZk7BNEv6hDhbkwNMKM1j2VMnQ9oZ rWtQ0yqtTSTu64b/XRvqdPzeGoIxQqnI2LnduGykmjwZ+BC9R2BVGp0oPocEhFOd6NBA M+vsFtsDF5hJslciVySstlF8uIhDVZvuMxVcYh1U+zaMiGKdWL/J5VFiCKK+UqGVmUo/ 9m8g== X-Gm-Message-State: AC+VfDwJlr2RDMJZ5TIb8LDr0u6JHmcO2OeqgZLDLhDIjC3wtpUnEHH0 KunnQHlhUyPcShTwQ6uQ2vt8XYAFTPo= X-Google-Smtp-Source: ACHHUZ5oLtC+la1Z9MEpCUEB+7iHGrGl23W9YnMCrUT2HgY+ocyp39ij5Mhx7Xs/BsNixC3gR3mZOw== X-Received: by 2002:a05:6870:a402:b0:19e:9c93:5c8d with SMTP id m2-20020a056870a40200b0019e9c935c8dmr1737295oal.18.1684883811876; Tue, 23 May 2023 16:16:51 -0700 (PDT) Received: from casantos.remote.csb ([179.176.185.1]) by smtp.gmail.com with ESMTPSA id a21-20020a056870e35500b0017fea9c156esm4108050oae.18.2023.05.23.16.16.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 May 2023 16:16:51 -0700 (PDT) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Tue, 23 May 2023 20:16:45 -0300 Message-Id: <20230523231645.33886-1-unixmania@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684883812; x=1687475812; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=TWEGpuhGN/aT+B6FKb1dUZp0/wmxtQGWYHCzEOHXAWc=; b=asMTRBYCZVxNglKKnnJtBUZpfOuP668IJCGS8p85exOeHpE+ooJZtWcQUJkpTdbvFp ecUDx8em6JJYLgMhxM5TFhEj2Hu1cXt/whpC60Xq8aoUMNauw1KyzIN6PbPH2aqsS/de PWNgOdwSx0fDWdt8oL2QR4NH9GpX49V4zcWahAxxDRjF4e++nciqGe/ZDigkX2uJN8Oc TUpOaS+WH0f/504ErNEKHWh667aAvYH8W1oBgJsVNn0hkUG0ru4m4Ydv1iOZjRbPtwlh ++p5iu6Ifmi303hmqNVAc/U7p0yVo9Bbsj0dm+ZIt8JLdJzZqp80JsaYBzhqsAXMU71q 2g2w== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=asMTRBYC Subject: [Buildroot] [PATCH v2] package/qemu: install keyboard maps only if necessary X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Carlos Santos , Romain Naour Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Carlos Santos They are required only for system emulation, so pull a patch already reviewd upstream that makes the installation conditional: https://patchwork.kernel.org/project/qemu-devel/patch/20230327172147.196607-1-casantos@redhat.com/ Signed-off-by: Carlos Santos --- Changes v1->v2 - Fixed reference to uptream patch, using the QEMU patchwork Note about the "Signed-off-by: Carlos Santos " in the patch: Thousands of Red Hat employees contribute to free software projects using their work email addresses. There is no contradiction between personal and employee activity regarding this. Check this document for additional information: Red Hat’s open source participation guidelines https://www.redhat.com/en/resources/open-source-participation-guidelines-overview --- ...tall-keyboard-maps-only-if-necessary.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 package/qemu/0003-meson-install-keyboard-maps-only-if-necessary.patch diff --git a/package/qemu/0003-meson-install-keyboard-maps-only-if-necessary.patch b/package/qemu/0003-meson-install-keyboard-maps-only-if-necessary.patch new file mode 100644 index 0000000000..91ea1e86c9 --- /dev/null +++ b/package/qemu/0003-meson-install-keyboard-maps-only-if-necessary.patch @@ -0,0 +1,36 @@ +From 9d9b74f806f5dbca53df6630c1a0591eaedd4500 Mon Sep 17 00:00:00 2001 +From: Carlos Santos +Date: Sun, 1 Jan 2023 21:00:57 -0300 +Subject: [PATCH] meson: install keyboard maps only if necessary + +They are required only for system emulation (i.e. have_system is true). + +Signed-off-by: Carlos Santos +--- + pc-bios/keymaps/meson.build | 6 ++++-- + 1 file changed, 4 insertions(+), 2 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 +-- +2.31.1 +