From 8a81dd87f8182f868c61ef646b5f7e550f978722 Mon Sep 17 00:00:00 2001
From: Tatiana Leon <Tatiana.Leon@digi.com>
Date: Thu, 11 Aug 2022 14:11:54 +0200
Subject: [PATCH] crank: add new crank image

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

Signed-off-by: Tatiana Leon <Tatiana.Leon@digi.com>
---
 meta-digi-dey/conf/distro/dey.conf              |  1 +
 .../recipes-core/images/dey-image-crank.bb      | 10 ++++++++++
 .../packagegroups/packagegroup-dey-crank.bb     | 13 +++++++++++++
 .../swu-images/dey-image-crank-swu.bb           |  8 ++++++++
 sdk/build-github.sh                             |  1 +
 sdk/build.sh                                    | 17 +++++++++--------
 6 files changed, 42 insertions(+), 8 deletions(-)
 create mode 100644 meta-digi-dey/recipes-core/images/dey-image-crank.bb
 create mode 100644 meta-digi-dey/recipes-crank/packagegroups/packagegroup-dey-crank.bb
 create mode 100644 meta-digi-dey/recipes-digi/swu-images/dey-image-crank-swu.bb

diff --git a/meta-digi-dey/conf/distro/dey.conf b/meta-digi-dey/conf/distro/dey.conf
index b0513e6c1..3db7e25c7 100644
--- a/meta-digi-dey/conf/distro/dey.conf
+++ b/meta-digi-dey/conf/distro/dey.conf
@@ -35,6 +35,7 @@ RECOVERY_INITRAMFS_IMAGE ?= "dey-image-recovery-initramfs"
 # DEY image features (alphabetical order)
 FEATURE_PACKAGES_dey-audio = "packagegroup-dey-audio"
 FEATURE_PACKAGES_dey-bluetooth = "packagegroup-dey-bluetooth"
+FEATURE_PACKAGES_dey-crank = "packagegroup-dey-crank"
 FEATURE_PACKAGES_dey-debug = "packagegroup-dey-debug"
 FEATURE_PACKAGES_dey-examples = "packagegroup-dey-examples"
 FEATURE_PACKAGES_dey-gstreamer = "packagegroup-dey-gstreamer"
diff --git a/meta-digi-dey/recipes-core/images/dey-image-crank.bb b/meta-digi-dey/recipes-core/images/dey-image-crank.bb
new file mode 100644
index 000000000..4be5fec96
--- /dev/null
+++ b/meta-digi-dey/recipes-core/images/dey-image-crank.bb
@@ -0,0 +1,10 @@
+# Copyright (C) 2022, Digi International Inc.
+
+require dey-image-graphical.inc
+
+DESCRIPTION = "DEY image including Crank Storyboard engine and demo packages"
+
+GRAPHICAL_CORE = "crank"
+
+# Remove X11 image features
+IMAGE_FEATURES:remove:ccimx6ul = "x11-base x11-sato"
diff --git a/meta-digi-dey/recipes-crank/packagegroups/packagegroup-dey-crank.bb b/meta-digi-dey/recipes-crank/packagegroups/packagegroup-dey-crank.bb
new file mode 100644
index 000000000..6e9484de6
--- /dev/null
+++ b/meta-digi-dey/recipes-crank/packagegroups/packagegroup-dey-crank.bb
@@ -0,0 +1,13 @@
+#
+# Copyright (C) 2022, Digi International Inc.
+#
+SUMMARY = "Crank packagegroup for DEY image"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+inherit packagegroup
+
+# Include Crank engine and demos
+RDEPENDS:${PN} += " \
+    crank-demos \
+    crank-sbengine \
+"
diff --git a/meta-digi-dey/recipes-digi/swu-images/dey-image-crank-swu.bb b/meta-digi-dey/recipes-digi/swu-images/dey-image-crank-swu.bb
new file mode 100644
index 000000000..107fd7d8b
--- /dev/null
+++ b/meta-digi-dey/recipes-digi/swu-images/dey-image-crank-swu.bb
@@ -0,0 +1,8 @@
+# Copyright (C) 2022 Digi International Inc.
+
+require swu.inc
+
+# Remove X11 image features
+IMAGE_FEATURES:remove:ccimx6ul = "x11-base x11-sato"
+
+IMG_NAME = "${@get_baseimg_pn(d)}-${GRAPHICAL_BACKEND}"
diff --git a/sdk/build-github.sh b/sdk/build-github.sh
index 7dc7530be..49d986db3 100755
--- a/sdk/build-github.sh
+++ b/sdk/build-github.sh
@@ -103,6 +103,7 @@ purge_sstate() {
 		packagegroup-dey-audio \
 		packagegroup-dey-bluetooth \
 		packagegroup-dey-core \
+		packagegroup-dey-crank \
 		packagegroup-dey-debug \
 		packagegroup-dey-examples \
 		packagegroup-dey-gstreamer \
diff --git a/sdk/build.sh b/sdk/build.sh
index 0e0998ad3..cdd6b8959 100755
--- a/sdk/build.sh
+++ b/sdk/build.sh
@@ -106,6 +106,7 @@ purge_sstate() {
 		packagegroup-dey-audio \
 		packagegroup-dey-bluetooth \
 		packagegroup-dey-core \
+		packagegroup-dey-crank \
 		packagegroup-dey-debug \
 		packagegroup-dey-examples \
 		packagegroup-dey-gstreamer \
@@ -171,18 +172,18 @@ while read _pl _var _tgt; do
 	eval "${_pl//-/_}_var=\"${_var//,/ }\""
 	eval "${_pl//-/_}_tgt=\"${_tgt//,/ }\""
 done<<-_EOF_
-	ccimx8mm-dvk         DONTBUILDVARIANTS   dey-image-qt,dey-image-aws
-	ccimx8mn-dvk         DONTBUILDVARIANTS   dey-image-qt,dey-image-aws
-	ccimx8mp-dvk         DONTBUILDVARIANTS   dey-image-qt,dey-image-aws
-	ccimx8x-sbc-pro      DONTBUILDVARIANTS   dey-image-qt,dey-image-aws
+	ccimx8mm-dvk         DONTBUILDVARIANTS   dey-image-qt,dey-image-aws,dey-image-crank
+	ccimx8mn-dvk         DONTBUILDVARIANTS   dey-image-qt,dey-image-aws,dey-image-crank
+	ccimx8mp-dvk         DONTBUILDVARIANTS   dey-image-qt,dey-image-aws,dey-image-crank
+	ccimx8x-sbc-pro      DONTBUILDVARIANTS   dey-image-qt,dey-image-aws,dey-image-crank
 	ccimx8x-sbc-express  DONTBUILDVARIANTS   dey-image-qt,dey-image-aws
-	ccimx6qpsbc          DONTBUILDVARIANTS   dey-image-qt,dey-image-aws
-	ccimx6sbc            DONTBUILDVARIANTS   dey-image-qt,dey-image-aws
-	ccimx6ulsbc          DONTBUILDVARIANTS   dey-image-qt,dey-image-aws
+	ccimx6qpsbc          DONTBUILDVARIANTS   dey-image-qt,dey-image-aws,dey-image-crank
+	ccimx6sbc            DONTBUILDVARIANTS   dey-image-qt,dey-image-aws,dey-image-crank
+	ccimx6ulsbc          DONTBUILDVARIANTS   dey-image-qt,dey-image-aws,dey-image-crank
 	ccimx6ulstarter      DONTBUILDVARIANTS   core-image-base,dey-image-aws
 	ccimx6ulsom          DONTBUILDVARIANTS   dey-image-mft-module-min
 	ccimx6ulrftest       DONTBUILDVARIANTS   dey-image-mft-module-rf
-	ccmp15-dvk           DONTBUILDVARIANTS   dey-image-qt,dey-image-aws
+	ccmp15-dvk           DONTBUILDVARIANTS   dey-image-qt,dey-image-aws,dey-image-crank
 _EOF_
 
 YOCTO_IMGS_DIR="${WORKSPACE}/images"