From 5054410dfa6a35911a0f5d6d33cbbce1d7d40d49 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Wed, 25 Jun 2025 18:34:03 +0200
Subject: [PATCH] packagegroup-core-x11-sato: reduce footprint for
 ccimx6ul-based images

* Disable GTK-based gstreamer player and connman network manager
* Remove matchbox-terminal to avoid pulling ICU
* Avoid pulseaudio client configuration to prevent duplicate instances

Also, delete the autospawn-for-root package config removal in our bbappend,
as that is not enabled by default in the recipe.

https://onedigi.atlassian.net/browse/DEL-9685

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 .../pulseaudio/pulseaudio_%.bbappend          |  2 --
 .../packagegroup-core-x11-sato.bbappend       | 24 ++++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend b/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
index f44917355..a000cdb95 100644
--- a/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
+++ b/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
@@ -55,8 +55,6 @@ SRC_URI:append:mx9-nxp-bsp = " \
     file://default.pa \
 "
 
-# Disable allow-autospawn-for-root as default
-PACKAGECONFIG:remove = "autospawn-for-root"
 PACKAGECONFIG[oss-output] = "-Doss-output=enabled,-Doss-output=disabled,"
 GLIBC_64BIT_TIME_FLAGS:pn-pulseaudio = " ${@bb.utils.contains('PACKAGECONFIG', 'oss-output', '', ' -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64', d)}"
 
diff --git a/meta-digi-dey/recipes-sato/packagegroups/packagegroup-core-x11-sato.bbappend b/meta-digi-dey/recipes-sato/packagegroups/packagegroup-core-x11-sato.bbappend
index 12a85f215..2aa811ef7 100644
--- a/meta-digi-dey/recipes-sato/packagegroups/packagegroup-core-x11-sato.bbappend
+++ b/meta-digi-dey/recipes-sato/packagegroups/packagegroup-core-x11-sato.bbappend
@@ -1,15 +1,17 @@
-# Copyright (C) 2014-2021, Digi International Inc.
+# Copyright (C) 2014-2025, Digi International Inc.
 
-# Disable network manager
-NETWORK_MANAGER = ""
+#
+# DEY only uses x11-sato based images on the CC6UL, so tweak the
+# recipe to fit in the small CC6UL rootfs.
+#
 
-RDEPENDS:${PN}-apps:remove:ccimx6ul = "gst-player"
+# Disable GTK-based gstreamer examples and network manager
+GSTEXAMPLES:dey = ""
+NETWORK_MANAGER:dey = ""
 
-matchbox-base = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', ' \
-                                         matchbox-desktop matchbox-session-sato  matchbox-keyboard matchbox-keyboard-applet matchbox-keyboard-im matchbox-config-gtk', '', d)}"
-matchbox-apps = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'matchbox-terminal', '', d)}"
+# Prevent installing ICU package
+RDEPENDS:${PN}-apps:remove:dey = "matchbox-terminal"
 
-RDEPENDS:${PN}-base:remove = "${matchbox-base}"
-RDEPENDS:${PN}-apps:remove = "${matchbox-apps} \
-                              gst-player-bin \
-"
+# Prevent launching a second instance of pulseaudio as
+# DEY uses system-wide pulseaudio
+RDEPENDS:${PN}-base:remove:dey = "pulseaudio-client-conf-sato"