From patchwork Fri Nov 8 17:01:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 52230 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 69A0ED64068 for ; Fri, 8 Nov 2024 17:02:16 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.17734.1731085327468921906 for ; Fri, 08 Nov 2024 09:02:07 -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 5AF83339 for ; Fri, 8 Nov 2024 09:02:36 -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 1CCC13F6A8 for ; Fri, 8 Nov 2024 09:02:06 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/8] rxvt-unicode: change virtual/x-terminal-emulator PROVIDES to RPROVIDES Date: Fri, 8 Nov 2024 17:01:49 +0000 Message-Id: <20241108170156.2057761-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 ; Fri, 08 Nov 2024 17:02:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206891 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 Fri Nov 8 17:01:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 52232 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 6A9F0D64063 for ; Fri, 8 Nov 2024 17:02:16 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.17866.1731085327776703903 for ; Fri, 08 Nov 2024 09:02:07 -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 D5550497 for ; Fri, 8 Nov 2024 09:02:36 -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 AA8A63F6A8 for ; Fri, 8 Nov 2024 09:02:06 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/8] matchbox-terminal: add x-terminal-emulator RPROVIDES and alternative Date: Fri, 8 Nov 2024 17:01:50 +0000 Message-Id: <20241108170156.2057761-2-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241108170156.2057761-1-ross.burton@arm.com> References: <20241108170156.2057761-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 ; Fri, 08 Nov 2024 17:02:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206892 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 Fri Nov 8 17:01:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 52229 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 68C8DD64067 for ; Fri, 8 Nov 2024 17:02:16 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.17735.1731085327855661719 for ; Fri, 08 Nov 2024 09:02:07 -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 6F33B152B for ; Fri, 8 Nov 2024 09:02:37 -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 3A8CF3F6A8 for ; Fri, 8 Nov 2024 09:02:07 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/8] default-providers.conf: add virtual-x-terminal-emulator Date: Fri, 8 Nov 2024 17:01:51 +0000 Message-Id: <20241108170156.2057761-3-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241108170156.2057761-1-ross.burton@arm.com> References: <20241108170156.2057761-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 ; Fri, 08 Nov 2024 17:02:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206893 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 Fri Nov 8 17:01:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 52233 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 79698D64069 for ; Fri, 8 Nov 2024 17:02:16 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.17868.1731085328745774747 for ; Fri, 08 Nov 2024 09:02:08 -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 08025339 for ; Fri, 8 Nov 2024 09:02:38 -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 C74BA3F6A8 for ; Fri, 8 Nov 2024 09:02:07 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 4/8] packagegroup-core-x11-base: use virtual-x-terminal-emulator Date: Fri, 8 Nov 2024 17:01:52 +0000 Message-Id: <20241108170156.2057761-4-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241108170156.2057761-1-ross.burton@arm.com> References: <20241108170156.2057761-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 ; Fri, 08 Nov 2024 17:02:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206894 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 Fri Nov 8 17:01:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 52231 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 87FE6D6406B for ; Fri, 8 Nov 2024 17:02:16 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.17736.1731085329047734276 for ; Fri, 08 Nov 2024 09:02:09 -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 95553497 for ; Fri, 8 Nov 2024 09:02:38 -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 60CA43F6A8 for ; Fri, 8 Nov 2024 09:02:08 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 5/8] xinit: use x-terminal-emulator as the fallback terminal Date: Fri, 8 Nov 2024 17:01:53 +0000 Message-Id: <20241108170156.2057761-5-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241108170156.2057761-1-ross.burton@arm.com> References: <20241108170156.2057761-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 ; Fri, 08 Nov 2024 17:02:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206895 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 Fri Nov 8 17:01:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 52234 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 924EDD64070 for ; Fri, 8 Nov 2024 17:02:16 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.17737.1731085329659100949 for ; Fri, 08 Nov 2024 09:02:09 -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 3F6BD339 for ; Fri, 8 Nov 2024 09:02:39 -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 EEE663F6A8 for ; Fri, 8 Nov 2024 09:02:08 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 6/8] builder: use x-terminal-emulator Date: Fri, 8 Nov 2024 17:01:54 +0000 Message-Id: <20241108170156.2057761-6-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241108170156.2057761-1-ross.burton@arm.com> References: <20241108170156.2057761-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 ; Fri, 08 Nov 2024 17:02:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206896 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 Fri Nov 8 17:01:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 52235 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 9B6FAD64072 for ; Fri, 8 Nov 2024 17:02:16 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.17738.1731085330239044516 for ; Fri, 08 Nov 2024 09:02:10 -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 BC2B2339 for ; Fri, 8 Nov 2024 09:02:39 -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 87DF63F6A8 for ; Fri, 8 Nov 2024 09:02:09 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 7/8] mini-x-session: use x-terminal-emulator Date: Fri, 8 Nov 2024 17:01:55 +0000 Message-Id: <20241108170156.2057761-7-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241108170156.2057761-1-ross.burton@arm.com> References: <20241108170156.2057761-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 ; Fri, 08 Nov 2024 17:02:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206897 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 From patchwork Fri Nov 8 17:01:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 52236 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 9B86ED64073 for ; Fri, 8 Nov 2024 17:02:16 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.17739.1731085330867272445 for ; Fri, 08 Nov 2024 09:02:11 -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 57111339 for ; Fri, 8 Nov 2024 09:02:40 -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 214813F6A8 for ; Fri, 8 Nov 2024 09:02:10 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 8/8] core-image-weston: use virtual-x-terminal-emulator instead of matchbox-terminal Date: Fri, 8 Nov 2024 17:01:56 +0000 Message-Id: <20241108170156.2057761-8-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241108170156.2057761-1-ross.burton@arm.com> References: <20241108170156.2057761-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 ; Fri, 08 Nov 2024 17:02:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206898 Don't hardcode matchbox-terminal, but use the alternative. Signed-off-by: Ross Burton --- meta/recipes-graphics/images/core-image-weston.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/images/core-image-weston.bb b/meta/recipes-graphics/images/core-image-weston.bb index 62305cc1cee..d5248cf480b 100644 --- a/meta/recipes-graphics/images/core-image-weston.bb +++ b/meta/recipes-graphics/images/core-image-weston.bb @@ -7,6 +7,6 @@ LICENSE = "MIT" inherit core-image CORE_IMAGE_BASE_INSTALL += "gtk+3-demo" -CORE_IMAGE_BASE_INSTALL += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'weston-xwayland matchbox-terminal', '', d)}" +CORE_IMAGE_BASE_INSTALL += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'weston-xwayland virtual-x-terminal-emulator', '', d)}" QB_MEM = "-m 512"