From cd9e12da32903a78187d16be5c830023d9601367 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Tue, 18 Oct 2022 11:30:26 +0200 Subject: [PATCH] meta-digi-dey: on CC6UL add connectcore demo only for core-image-base If we add the demo to the graphical images (dey-image-qt) the resulting image does not fit on the rootfs partition for the smallest variant. https://onedigi.atlassian.net/browse/DEL-8004 Signed-off-by: Javier Viguera --- meta-digi-dey/recipes-core/images/core-image-base.bbappend | 7 ++++++- .../recipes-core/packagegroups/packagegroup-dey-core.bb | 6 +++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/meta-digi-dey/recipes-core/images/core-image-base.bbappend b/meta-digi-dey/recipes-core/images/core-image-base.bbappend index 4f27a497a..af494f49a 100644 --- a/meta-digi-dey/recipes-core/images/core-image-base.bbappend +++ b/meta-digi-dey/recipes-core/images/core-image-base.bbappend @@ -1,5 +1,5 @@ # -# Copyright (C) 2016 Digi International. +# Copyright (C) 2016-2022 Digi International. # IMAGE_FEATURES += " \ @@ -18,6 +18,11 @@ IMAGE_FEATURES:remove = "${@oe.utils.conditional('IS_HEADLESS', 'true', ' splash CORE_IMAGE_BASE_INSTALL += "dey-examples-digiapix" +# The connectcore demo was removed from 'packagegroup-dey-core' for the +# 6UL (because of rootfs space limits). Add it here, to install it in the +# non-graphical core-image-base. +CORE_IMAGE_BASE_INSTALL:append:ccimx6ul = " connectcore-demo-example" + # SDK features (for toolchains generated from an image with populate_sdk) SDKIMAGE_FEATURES ?= "dev-pkgs dbg-pkgs staticdev-pkgs" diff --git a/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb b/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb index 14f3c310b..462e03795 100644 --- a/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb +++ b/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb @@ -1,5 +1,5 @@ # -# Copyright (C) 2012-2017 Digi International. +# Copyright (C) 2012-2022 Digi International. # SUMMARY = "Core packagegroup for DEY image" @@ -67,6 +67,10 @@ RDEPENDS:${PN} = "\ ${MACHINE_EXTRA_RDEPENDS} \ " +# The rootfs in the CC6UL is not big enough for graphic images (QT) and the +# connectcore demo, so we restrict the demo only for the 'core-image-base' +RDEPENDS:${PN}:remove:ccimx6ul = "connectcore-demo-example" + RRECOMMENDS:${PN} = "\ ${VIRTUAL-RUNTIME_base-utils-syslog} \ ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS} \