From patchwork Wed Nov 13 15:55:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 52425 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 aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 80B62D462CE for ; Wed, 13 Nov 2024 15:55:22 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.14821.1731513320908458291 for ; Wed, 13 Nov 2024 07:55:21 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 7BED41474 for ; Wed, 13 Nov 2024 07:55:50 -0800 (PST) Received: from cesw-amp-gbt-1s-m12830-04.oss.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 1CD193F66E for ; Wed, 13 Nov 2024 07:55:19 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v2 6/8] xinit: use x-terminal-emulator as the fallback terminal Date: Wed, 13 Nov 2024 15:55:09 +0000 Message-Id: <20241113155511.1948551-6-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241113155511.1948551-1-ross.burton@arm.com> References: <20241113155511.1948551-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 13 Nov 2024 15:55:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207118 Instead of using rxvt as the fallback terminal use x-terminal-emulator. Also add a recommends on something providing that name, as previously it tried to use rxvt but that wasn't necessarily present. Signed-off-by: Ross Burton --- meta/recipes-graphics/xorg-app/xinit_1.4.2.bb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/xorg-app/xinit_1.4.2.bb b/meta/recipes-graphics/xorg-app/xinit_1.4.2.bb index 82c0b0d8335..8a8367c6888 100644 --- a/meta/recipes-graphics/xorg-app/xinit_1.4.2.bb +++ b/meta/recipes-graphics/xorg-app/xinit_1.4.2.bb @@ -18,9 +18,8 @@ SRC_URI_EXT = "xz" SRC_URI[sha256sum] = "b7d8dc8d22ef9f15985a10b606ee4f2aad6828befa437359934647e88d331f23" -EXTRA_OECONF = "ac_cv_path_MCOOKIE=${bindir}/mcookie" - -PACKAGECONFIG ??= "rxvt" -PACKAGECONFIG[rxvt] = "--with-xterm=rxvt,,,rxvt-unicode" +EXTRA_OECONF = "ac_cv_path_MCOOKIE=${bindir}/mcookie \ + --with-xterm=x-terminal-emulator" RDEPENDS:${PN} += "util-linux-mcookie" +RRECOMMENDS:${PN} += "virtual-x-terminal-emulator"