From patchwork Wed Nov 13 15:55:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 52431 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 82AB1D462CF 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.14816.1731513317604865160 for ; Wed, 13 Nov 2024 07:55:18 -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 A5B771474 for ; Wed, 13 Nov 2024 07:55:46 -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 43E3B3F66E for ; Wed, 13 Nov 2024 07:55:16 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v2 1/8] rxvt-unicode: change virtual/x-terminal-emulator PROVIDES to RPROVIDES Date: Wed, 13 Nov 2024 15:55:04 +0000 Message-Id: <20241113155511.1948551-1-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 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/207113 The point of the virtual-x-terminal-emulator alternative was to provide a single binary that executes whatever terminal has been installed. This is a runtime choice, so should be RPROVIDES. This doesn't need built-time PROVIDES, which actively get in the way when multiple recipes are being built with the same PROVIDES. Signed-off-by: Ross Burton --- meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc index 5193eebb0bc..2ee3edefa76 100644 --- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc +++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc @@ -15,7 +15,7 @@ SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 inherit autotools pkgconfig update-alternatives -PROVIDES = "virtual/x-terminal-emulator" +RPROVIDES:${PN} = "virtual-x-terminal-emulator" ALTERNATIVE:${PN} = "x-terminal-emulator" ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/rxvt" From patchwork Wed Nov 13 15:55:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 52426 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 7EC4BD462CA 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.14817.1731513317977063791 for ; Wed, 13 Nov 2024 07:55:18 -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 6C955150C for ; Wed, 13 Nov 2024 07:55:47 -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 0D6153F66E for ; Wed, 13 Nov 2024 07:55:16 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v2 2/8] rxvt-unicode: add x11 DISTRO_FEATURE check Date: Wed, 13 Nov 2024 15:55:05 +0000 Message-Id: <20241113155511.1948551-2-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/207114 rxvt is a classic X11 application, so add the feature check so it doesn't get pulled into world builds without x11. Signed-off-by: Ross Burton --- meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc index 2ee3edefa76..8cd41f33923 100644 --- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc +++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc @@ -13,7 +13,9 @@ SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 file://rxvt.desktop \ file://rxvt.png" -inherit autotools pkgconfig update-alternatives +inherit autotools features_check pkgconfig update-alternatives + +REQUIRED_DISTRO_FEATURES = "x11" RPROVIDES:${PN} = "virtual-x-terminal-emulator" ALTERNATIVE:${PN} = "x-terminal-emulator" From patchwork Wed Nov 13 15:55:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 52429 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 96BCCD462D0 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.14818.1731513318602077058 for ; Wed, 13 Nov 2024 07:55:18 -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 2E0FA1474 for ; Wed, 13 Nov 2024 07:55:48 -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 CAC133F66E for ; Wed, 13 Nov 2024 07:55:17 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v2 3/8] matchbox-terminal: add x-terminal-emulator RPROVIDES and alternative Date: Wed, 13 Nov 2024 15:55:06 +0000 Message-Id: <20241113155511.1948551-3-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/207115 Add a RPROVIDES for virtual-x-terminal-emulator, so that: - Packages can RDEPEND on virtual-x-terminal-emulator and know that they have installed a terminal - The x-terminal-emulator binary will (via alternatives) run a terminal We don't bother with PROVIDES because nobody needs to DEPEND on a terminal, the entire point of this is that the actual binary is interchangable. Signed-off-by: Ross Burton --- .../matchbox-terminal/matchbox-terminal_0.2.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb index f91c593f784..c9b01b3cfd9 100644 --- a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb +++ b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb @@ -16,6 +16,11 @@ PV = "0.2+git" S = "${WORKDIR}/git" -inherit autotools pkgconfig features_check +inherit autotools pkgconfig features_check update-alternatives ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +RPROVIDES:${PN} = "virtual-x-terminal-emulator" +ALTERNATIVE:${PN} = "x-terminal-emulator" +ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/matchbox-terminal" +ALTERNATIVE_PRIORITY[x-terminal-emulator] = "20" From patchwork Wed Nov 13 15:55:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 52427 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 96C84D462D3 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.web10.15124.1731513319754419380 for ; Wed, 13 Nov 2024 07:55:19 -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 E96E31474 for ; Wed, 13 Nov 2024 07:55:48 -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 8ACC93F66E for ; Wed, 13 Nov 2024 07:55:18 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v2 4/8] default-providers.conf: add virtual-x-terminal-emulator Date: Wed, 13 Nov 2024 15:55:07 +0000 Message-Id: <20241113155511.1948551-4-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/207116 We have multiple recipes in core that RPROVIDE virtual-x-terminal-emulator, so we should pick one to be the default for deterministic builds. Pick rxvt, as it's the lightest. Sato can depend on matchbox-terminal explicitly and rxvt will not be added. Signed-off-by: Ross Burton --- meta/conf/distro/include/default-providers.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index d18173c7449..b32c4e0d254 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -59,3 +59,5 @@ PREFERRED_PROVIDER_pkgconfig-native ?= "pkgconfig-native" PREFERRED_RPROVIDER_initd-functions ?= "initscripts" PREFERRED_PROVIDER_nativesdk-mesa ?= "nativesdk-mesa" + +PREFERRED_RPROVIDER_virtual-x-terminal-emulator ?= "rxvt-unicode" From patchwork Wed Nov 13 15:55:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 52428 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 A9B92D462D7 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.14820.1731513320323157400 for ; Wed, 13 Nov 2024 07:55:20 -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 D93631474 for ; Wed, 13 Nov 2024 07:55:49 -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 53C8E3F66E for ; Wed, 13 Nov 2024 07:55:19 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v2 5/8] packagegroup-core-x11-base: use virtual-x-terminal-emulator Date: Wed, 13 Nov 2024 15:55:08 +0000 Message-Id: <20241113155511.1948551-5-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/207117 Instead of depending on matchbox-terminal explicitly, just depend on the virtual name. core-image-x11 then uses rxvt instead of matchbox-terminal, as that is the default, removing the entire GTK+ stack from the image. core-image-sato and friends are unchanged as the sato packagegroup pulls in matchbox-terminal explicitly, so rxvt isn't needed. Signed-off-by: Ross Burton --- .../packagegroups/packagegroup-core-x11-base.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb index db6242af335..d82d318368e 100644 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb @@ -8,8 +8,8 @@ REQUIRED_DISTRO_FEATURES = "x11" RDEPENDS:${PN} = "\ packagegroup-core-x11-xserver \ packagegroup-core-x11-utils \ - matchbox-terminal \ matchbox-wm \ mini-x-session \ + virtual-x-terminal-emulator \ liberation-fonts \ " 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" From patchwork Wed Nov 13 15:55:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 52430 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 A85A9D462D6 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.14822.1731513321896712208 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 4557D1474 for ; Wed, 13 Nov 2024 07:55:51 -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 DA53A3F66E for ; Wed, 13 Nov 2024 07:55:20 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v2 7/8] builder: use x-terminal-emulator Date: Wed, 13 Nov 2024 15:55:10 +0000 Message-Id: <20241113155511.1948551-7-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/207119 Don't hardcode matchbox-terminal, but use the alternative. Signed-off-by: Ross Burton --- meta/recipes-graphics/builder/files/builder_session.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/builder/files/builder_session.sh b/meta/recipes-graphics/builder/files/builder_session.sh index 4e509a701ac..a59c5ce84b6 100644 --- a/meta/recipes-graphics/builder/files/builder_session.sh +++ b/meta/recipes-graphics/builder/files/builder_session.sh @@ -30,4 +30,4 @@ fi cd /home/builder/poky . ./oe-init-build-env -matchbox-terminal& +x-terminal-emulator & From patchwork Wed Nov 13 15:55:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 52432 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 B72B6D462D9 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.14823.1731513322402238257 for ; Wed, 13 Nov 2024 07:55:22 -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 0E6D31474 for ; Wed, 13 Nov 2024 07:55:52 -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 A38FB3F66E for ; Wed, 13 Nov 2024 07:55:21 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v2 8/8] mini-x-session: use x-terminal-emulator Date: Wed, 13 Nov 2024 15:55:11 +0000 Message-Id: <20241113155511.1948551-8-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/207120 Don't hardcode matchbox-terminal, but use the alternative. Signed-off-by: Ross Burton --- meta/recipes-graphics/mini-x-session/files/mini-x-session | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-graphics/mini-x-session/files/mini-x-session b/meta/recipes-graphics/mini-x-session/files/mini-x-session index dca655a9139..181e995337b 100644 --- a/meta/recipes-graphics/mini-x-session/files/mini-x-session +++ b/meta/recipes-graphics/mini-x-session/files/mini-x-session @@ -35,5 +35,6 @@ xrandr -s 1024x768 # Default files to run if $HOME/.mini_x/session or /etc/mini_x/session # dont exist. -matchbox-terminal& +x-terminal-emulator & + exec matchbox-window-manager