From 3a39aacdd7a649b31d97461a83369381c0455c3f Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Fri, 23 Sep 2016 16:03:36 +0200
Subject: [PATCH] meta-digi-dey: rework installed packages for ccimx6ul

CCIMX6UL's rootfs partition is not big enough for the default
'dey-image-qt' image. This commit reworks the QT5 and SATO installed
packages for the ccimx6ul, so the image fits in the rootfs partition.

https://jira.digi.com/browse/DEL-2607

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 .../packagegroups/packagegroup-dey-qt.bb           | 14 +++++++-------
 .../packagegroup-core-x11-sato.bbappend            |  2 ++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb b/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb
index 4e5e94a34..b4197ab64 100644
--- a/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb
+++ b/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb
@@ -4,6 +4,7 @@
 SUMMARY = "QT packagegroup for DEY image"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
+
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit packagegroup
@@ -11,21 +12,20 @@ inherit packagegroup
 MACHINE_QT5_EXTRA_INSTALL ?= ""
 MACHINE_QT5_EXTRA_INSTALL_ccimx6 ?= "qtwebengine-examples"
 
-QT5_PKS = " \
-    qtbase-fonts \
-    qtdeclarative-tools \
-"
+QT5_PKS = "qtbase-fonts qtserialport"
+QT5_PKS_append_ccimx6 = " qtdeclarative-tools"
 
-QT5_EXAMPLES = " \
+QT5_EXAMPLES = "qtbase-examples"
+QT5_EXAMPLES_append_ccimx6 = " \
     qt3d-examples \
-    qtbase-examples \
     qtconnectivity-examples \
     qtdeclarative-examples \
     qtmultimedia-examples \
     qtsvg-examples \
 "
 
-QT5_DEMOS = " \
+QT5_DEMOS = ""
+QT5_DEMOS_append_ccimx6 = " \
     cinematicexperience \
     qt5-demo-extrafiles \
     qt5everywheredemo \
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 171a8fee6..fdf38bf10 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
@@ -2,3 +2,5 @@
 
 # Disable network manager
 NETWORK_MANAGER = ""
+
+RDEPENDS_${PN}-apps_remove_ccimx6ul = "gst-player-bin x11vnc"