[dunfell/master][PATCH 0/6] Install qt based demos on machine feature check

[dunfell/master][PATCH 0/6] Install qt based demos on machine feature check

[Gowtham Tammana]

The following demo packages are qt based and have a dependency on it, so they
have to be installed conditionally on the machine feature gpu presence. This
series add those changes to ensure dependencies are populated correctly for
different sdk images.

  - pdm-anomaly-detection
  - matrix-analytics-pdm-anomaly-detection
  - dual-camera-demo
  - matrix-gui-apps-dual-camera
  - image-gallery
  - matrix-gui-apps-image-gallery
  - evse-hmi
  - matrix-hmi-demo-evse
  - matrix-hmi-demo-mmwavegesture
  - matrix-hmi-demo-protection-relays

Gowtham Tammana (6):
  ti-demos: Add feature check for pdm demos
  packagegroup-arago-tisdk*: add feature check for pdm-anomaly-detection
  packagegroup-arago-tisdk*: Add feature depenendency for
    dual-camera-demo
  packagegroups-arago-tisdk*: image-gallery: Add machine feature
    conditional
  tisdk-core-bundle: Conditionally install the hmi demos
  packagegroup-arago-tisdk-hmi*: Install them conditionally

 .../recipes-core/images/tisdk-core-bundle.inc |  2 +-
 ...ackagegroup-arago-tisdk-addons-sdk-host.bb | 12 +++--
 ...kagegroup-arago-tisdk-addons-sdk-target.bb | 13 +++--
 .../packagegroup-arago-tisdk-hmi-sdk-host.bb  |  4 +-
 .../packagegroup-arago-tisdk-hmi.bb           |  4 +-
 .../packagegroup-arago-tisdk-matrix.bb        | 51 +++++++++++--------
 ...gegroup-arago-tisdk-multimedia-sdk-host.bb | 11 ++--
 .../packagegroup-arago-tisdk-multimedia.bb    | 11 ++--
 .../recipes-core/packagegroups/ti-demos.bb    | 10 ++--
 9 files changed, 73 insertions(+), 45 deletions(-)

-- 
2.31.1

[dunfell/master][PATCH 1/6] ti-demos: Add feature check for pdm demos

[Gowtham Tammana]

`pdm-anomaly-detection` needs qt which in turns is dependent on gpu
machine feature. Add the corresponding feature check to capture
dependencies correctly.

Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
---
 .../recipes-core/packagegroups/ti-demos.bb             | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-demos.bb b/meta-arago-distro/recipes-core/packagegroups/ti-demos.bb
index 054c2f53..6141799f 100644
--- a/meta-arago-distro/recipes-core/packagegroups/ti-demos.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/ti-demos.bb
@@ -5,11 +5,13 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit packagegroup
 
+PDM_ANOMALY_PKG = "${@bb.utils.contains('MACHINE_FEATURES', 'gpu', 'pdm-anomaly-detection', '', d)}"
+
 PDM_ANOMALY = ""
-PDM_ANOMALY_ti33x = "pdm-anomaly-detection"
-PDM_ANOMALY_ti43x = "pdm-anomaly-detection"
-PDM_ANOMALY_omap-a15 = "pdm-anomaly-detection"
-PDM_ANOMALY_am65xx = "pdm-anomaly-detection"
+PDM_ANOMALY_ti33x = "${PDM_ANOMALY_PKG}"
+PDM_ANOMALY_ti43x = "${PDM_ANOMALY_PKG}"
+PDM_ANOMALY_omap-a15 = "${PDM_ANOMALY_PKG}"
+PDM_ANOMALY_am65xx = "${PDM_ANOMALY_PKG}"
 
 RDEPENDS_${PN} = "\
     ${PDM_ANOMALY} \
-- 
2.31.1

[dunfell/master][PATCH 2/6] packagegroup-arago-tisdk*: add feature check for pdm-anomaly-detection

[Gowtham Tammana]

pdm-anomaly-detection pacakge is needs qt which is dependent on gpu
machine feature. Add the pacakge conditionally to the packagegroup to
ensure right dependency chain.

Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
---
 ...ackagegroup-arago-tisdk-addons-sdk-host.bb | 12 ++++++----
 ...kagegroup-arago-tisdk-addons-sdk-target.bb | 13 +++++++----
 .../packagegroup-arago-tisdk-matrix.bb        | 23 +++++++++++++------
 3 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
index 34cb619e..d42f213d 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
@@ -99,22 +99,26 @@ EXTRA_LIBS_append_keystone = " \
 #    gdbserverproxy-module-drv-src \
 #"
 
+PDM_ANOMALY_PKG_SRC = "\
+    ${@bb.utils.contains('MACHINE_FEATURES', 'gpu', 'pdm-anomaly-detection-src', '', d)} \
+"
+
 EXTRA_PACKAGES = ""
 
 EXTRA_PACKAGES_append_omap-a15 = " \
-    pdm-anomaly-detection-src \
+    ${PDM_ANOMALY_PKG_SRC} \
 "
 
 EXTRA_PACKAGES_append_ti33x = " \
-    pdm-anomaly-detection-src \
+    ${PDM_ANOMALY_PKG_SRC} \
 "
 
 EXTRA_PACKAGES_append_ti43x = " \
-    pdm-anomaly-detection-src \
+    ${PDM_ANOMALY_PKG_SRC} \
 "
 
 EXTRA_PACKAGES_append_am65xx = " \
-    pdm-anomaly-detection-src \
+    ${PDM_ANOMALY_PKG_SRC} \
 "
 
 RDEPENDS_${PN} = "\
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb
index b55c79a4..48a6cd5e 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb
@@ -169,29 +169,34 @@ EXTRA_LIBS_append_k2e = " libulm-staticdev \
                               gdbserver-c6x-dev \
 "
 
+PDM_ANOMALY_PKG_DEV = "\
+    ${@bb.utils.contains('MACHINE_FEATURES', 'gpu', 'pdm-anomaly-detection-dev', '', d)} \
+"
+
+
 EXTRA_PACKAGES = ""
 EXTRA_PACKAGES_append_ti33x = " \
                                 arm-compute-library-dev \
                                 tensorflow-lite-dev \
                                 tensorflow-lite-staticdev \
-                                pdm-anomaly-detection-dev \
+                                ${PDM_ANOMALY_PKG_DEV} \
 "
 EXTRA_PACKAGES_append_ti43x = " \
                                 arm-compute-library-dev \
                                 tensorflow-lite-dev \
                                 tensorflow-lite-staticdev \
-                                pdm-anomaly-detection-dev \
+                                ${PDM_ANOMALY_PKG_DEV} \
 "
 EXTRA_PACKAGES_append_omap-a15 = " \
                                 arm-compute-library-dev \
                                 tensorflow-lite-dev \
                                 tensorflow-lite-staticdev \
-                                pdm-anomaly-detection-dev \
+                                ${PDM_ANOMALY_PKG_DEV} \
 "
 EXTRA_PACKAGES_append_am65xx = " arm-compute-library-dev \
                              tensorflow-lite-dev \
                              tensorflow-lite-staticdev \
-                             pdm-anomaly-detection-dev \
+                             ${PDM_ANOMALY_PKG_DEV} \
 "
 
 IPCDEV = " \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
index 897b354a..2483e8a8 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
@@ -35,6 +35,22 @@ MATRIX_QT_APPS = " \
     matrix-gui-thermostat-demo \
 "
 
+MATRIX_QT_APPS_append_omap-a15 = " \
+    matrix-analytics-pdm-anomaly-detection \
+"
+
+MATRIX_QT_APPS_append_am65xx = " \
+    matrix-analytics-pdm-anomaly-detection \
+"
+
+MATRIX_QT_APPS_append_ti33x = " \
+    matrix-analytics-pdm-anomaly-detection \
+"
+
+MATRIX_QT_APPS_append_ti43x = " \
+    matrix-analytics-pdm-anomaly-detection \
+"
+
 MATRIX_TOUCH_APPS = " \
     ${@bb.utils.contains('MACHINE_FEATURES','gpu','matrix-gui-touch-demos','',d)} \
 "
@@ -96,8 +112,6 @@ MATRIX_APPS_append_ti33x = "        \
     matrix-hmi-demo-mmwavegesture   \
                                     \
     ${MATRIX_OPENCV_ARM_ONLY_APPS}  \
-                                    \
-    matrix-analytics-pdm-anomaly-detection \
 "
 
 MATRIX_APPS_append_ti43x = "        \
@@ -119,8 +133,6 @@ MATRIX_APPS_append_ti43x = "        \
     matrix-hmi-demo-mmwavegesture   \
                                     \
     ${MATRIX_OPENCV_ARM_ONLY_APPS}  \
-                                    \
-    matrix-analytics-pdm-anomaly-detection \
 "
 
 MATRIX_APPS_append_omap-a15 = "     \
@@ -140,7 +152,6 @@ MATRIX_APPS_append_omap-a15 = "     \
     matrix-gui-generic-pm           \
     matrix-gui-clocks               \
     matrix-gui-pm-demos-governor    \
-    matrix-analytics-pdm-anomaly-detection \
 "
 
 #    ${@['','matrix-gui-browser-demos'][bb.utils.contains('MACHINE_FEATURES','gpu',True,False,d) and bb.utils.contains('DISTRO_FEATURES','wayland',True,False,d)]} \
@@ -158,8 +169,6 @@ MATRIX_APPS_append_am65xx = "           \
     matrix-hmi-demo-mmwavegesture   \
                                     \
     ${MATRIX_OPENCV_ARM_ONLY_APPS}  \
-                                    \
-    matrix-analytics-pdm-anomaly-detection \
 "
 
 MATRIX_APPS_append_dra7xx += " \
-- 
2.31.1

[dunfell/master][PATCH 3/6] packagegroup-arago-tisdk*: Add feature depenendency for dual-camera-demo

[Gowtham Tammana]

`dual-camera-demo` package is qt based application, which is dependent
on gpu machine feature. Add the package to packagegroups conditionally
to enusure correct dependency chain.

Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
---
 .../packagegroups/packagegroup-arago-tisdk-matrix.bb        | 2 +-
 .../packagegroup-arago-tisdk-multimedia-sdk-host.bb         | 6 ++++--
 .../packagegroups/packagegroup-arago-tisdk-multimedia.bb    | 6 ++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
index 2483e8a8..65c75459 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
@@ -49,6 +49,7 @@ MATRIX_QT_APPS_append_ti33x = " \
 
 MATRIX_QT_APPS_append_ti43x = " \
     matrix-analytics-pdm-anomaly-detection \
+    matrix-gui-apps-dual-camera     \
 "
 
 MATRIX_TOUCH_APPS = " \
@@ -126,7 +127,6 @@ MATRIX_APPS_append_ti43x = "        \
     matrix-gui-clocks               \
     matrix-gui-pm-demos-governor    \
                                     \
-    matrix-gui-apps-dual-camera     \
     matrix-gui-apps-image-gallery   \
                                     \
     matrix-hmi-demo-evse            \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
index 081cc926..f3c23b83 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
@@ -11,18 +11,20 @@ BARCODE_PKG = ""
 #    ${@['','barcode-roi-src'][oe.utils.all_distro_features(d, 'opencv', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \
 #"
 
+DUAL_CAMERA_PKG = "${@bb.utils.contains('MACHINE_FEATURES', 'gpu', 'dual-camera-demo-src', '', d)}"
+
 MULTIMEDIA = ""
 
 MULTIMEDIA_append_ti33x = " ${BARCODE_PKG}"
 
 MULTIMEDIA_append_ti43x = " \
-    dual-camera-demo-src \
+    ${DUAL_CAMERA_PKG} \
     image-gallery-src \
     ${BARCODE_PKG} \
 "
 
 MULTIMEDIA_append_omap-a15 = " \
-    dual-camera-demo-src \
+    ${DUAL_CAMERA_PKG} \
     image-gallery-src \
     ${BARCODE_PKG} \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb
index 36ebd35a..da1a64e2 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb
@@ -16,13 +16,15 @@ MULTIMEDIA_append_keystone = " \
     hevc-arm-decoder \
 "
 
+DUAL_CAMERA_DEMO = "${@bb.utils.contains('MACHINE_FEATURES', 'gpu', 'dual-camera-demo', '', d)}"
+
 MULTIMEDIA_append_ti43x = " \
-    dual-camera-demo \
+    ${DUAL_CAMERA_DEMO} \
     image-gallery \
 "
 
 MULTIMEDIA_append_omap-a15 = " \
-    dual-camera-demo \
+    ${DUAL_CAMERA_DEMO} \
     image-gallery \
 "
 
-- 
2.31.1

[dunfell/master][PATCH 4/6] packagegroups-arago-tisdk*: image-gallery: Add machine feature conditional

[Gowtham Tammana]

image-gallery is dependent on qt, so make it a gpu machine feature
conditional package.

Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
---
 .../packagegroups/packagegroup-arago-tisdk-matrix.bb         | 2 +-
 .../packagegroup-arago-tisdk-multimedia-sdk-host.bb          | 5 +++--
 .../packagegroups/packagegroup-arago-tisdk-multimedia.bb     | 5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
index 65c75459..74b49898 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
@@ -50,6 +50,7 @@ MATRIX_QT_APPS_append_ti33x = " \
 MATRIX_QT_APPS_append_ti43x = " \
     matrix-analytics-pdm-anomaly-detection \
     matrix-gui-apps-dual-camera     \
+    matrix-gui-apps-image-gallery   \
 "
 
 MATRIX_TOUCH_APPS = " \
@@ -127,7 +128,6 @@ MATRIX_APPS_append_ti43x = "        \
     matrix-gui-clocks               \
     matrix-gui-pm-demos-governor    \
                                     \
-    matrix-gui-apps-image-gallery   \
                                     \
     matrix-hmi-demo-evse            \
     matrix-hmi-demo-mmwavegesture   \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
index f3c23b83..96f165ad 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
@@ -12,6 +12,7 @@ BARCODE_PKG = ""
 #"
 
 DUAL_CAMERA_PKG = "${@bb.utils.contains('MACHINE_FEATURES', 'gpu', 'dual-camera-demo-src', '', d)}"
+IMAGE_GALLERY_PKG = "${@bb.utils.contains('MACHINE_FEATURES', 'gpu','image-gallery-src', '', d)}"
 
 MULTIMEDIA = ""
 
@@ -19,13 +20,13 @@ MULTIMEDIA_append_ti33x = " ${BARCODE_PKG}"
 
 MULTIMEDIA_append_ti43x = " \
     ${DUAL_CAMERA_PKG} \
-    image-gallery-src \
+    ${IMAGE_GALLERY_PKG} \
     ${BARCODE_PKG} \
 "
 
 MULTIMEDIA_append_omap-a15 = " \
     ${DUAL_CAMERA_PKG} \
-    image-gallery-src \
+    ${IMAGE_GALLERY_PKG} \
     ${BARCODE_PKG} \
 "
 
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb
index da1a64e2..b87966be 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb
@@ -17,15 +17,16 @@ MULTIMEDIA_append_keystone = " \
 "
 
 DUAL_CAMERA_DEMO = "${@bb.utils.contains('MACHINE_FEATURES', 'gpu', 'dual-camera-demo', '', d)}"
+IMAGE_GALLERY_DEMO = "${@bb.utils.contains('MACHINE_FEATURES', 'gpu', 'image-gallery', '', d)}"
 
 MULTIMEDIA_append_ti43x = " \
     ${DUAL_CAMERA_DEMO} \
-    image-gallery \
+    ${IMAGE_GALLERY_DEMO} \
 "
 
 MULTIMEDIA_append_omap-a15 = " \
     ${DUAL_CAMERA_DEMO} \
-    image-gallery \
+    ${IMAGE_GALLERY_DEMO} \
 "
 
 MULTIMEDIA_append_dra7xx = " \
-- 
2.31.1

[dunfell/master][PATCH 5/6] tisdk-core-bundle: Conditionally install the hmi demos

[Gowtham Tammana]

hmi demos have qt dependency, so install them on corresponding machine
feature condition.

Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
---
 meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc
index d8fd9d2d..9f0e65db 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc
+++ b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc
@@ -47,7 +47,7 @@ IMAGE_INSTALL = "\
     ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-graphics-sdk-host','',d)} \
     packagegroup-arago-tisdk-matrix-sdk-host \
     packagegroup-arago-tisdk-multimedia-sdk-host \
-    packagegroup-arago-tisdk-hmi-sdk-host \
+    ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-hmi-sdk-host','',d)} \
     packagegroup-arago-tisdk-amsdk-sdk-host${ARAGO_KERNEL_SUFFIX} \
     ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-qte-sdk-host','',d)} \
 "
-- 
2.31.1

[dunfell/master][PATCH 6/6] packagegroup-arago-tisdk-hmi*: Install them conditionally

[Gowtham Tammana]

hmi demos have qt dependency, so install them through corresponding
machine feature condition.

Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
---
 .../packagegroup-arago-tisdk-hmi-sdk-host.bb  |  4 +++-
 .../packagegroup-arago-tisdk-hmi.bb           |  4 +++-
 .../packagegroup-arago-tisdk-matrix.bb        | 24 +++++++++----------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi-sdk-host.bb
index 1eb83d18..6c6ce6e0 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi-sdk-host.bb
@@ -4,7 +4,9 @@ PR = "r1"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-inherit packagegroup
+inherit packagegroup features_check
+
+REQUIRED_MACHINE_FEATURES = "gpu"
 
 HMI = ""
 
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi.bb
index 10f6d306..6958f08c 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi.bb
@@ -4,7 +4,9 @@ PR = "r0"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-inherit packagegroup
+inherit packagegroup features_check
+
+REQUIRED_MACHINE_FEATURES = "gpu"
 
 HMI = " \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
index 74b49898..4675cb80 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
@@ -37,20 +37,31 @@ MATRIX_QT_APPS = " \
 
 MATRIX_QT_APPS_append_omap-a15 = " \
     matrix-analytics-pdm-anomaly-detection \
+    matrix-hmi-demo-evse            \
+    matrix-hmi-demo-mmwavegesture   \
 "
 
 MATRIX_QT_APPS_append_am65xx = " \
     matrix-analytics-pdm-anomaly-detection \
+                                    \
+    matrix-hmi-demo-evse            \
+    matrix-hmi-demo-mmwavegesture   \
 "
 
 MATRIX_QT_APPS_append_ti33x = " \
     matrix-analytics-pdm-anomaly-detection \
+    matrix-hmi-demo-evse            \
+    matrix-hmi-demo-protection-relays \
+    matrix-hmi-demo-mmwavegesture   \
 "
 
 MATRIX_QT_APPS_append_ti43x = " \
     matrix-analytics-pdm-anomaly-detection \
     matrix-gui-apps-dual-camera     \
     matrix-gui-apps-image-gallery   \
+                                    \
+    matrix-hmi-demo-evse            \
+    matrix-hmi-demo-mmwavegesture   \
 "
 
 MATRIX_TOUCH_APPS = " \
@@ -109,10 +120,6 @@ MATRIX_APPS_append_ti33x = "        \
                                     \
     matrix-gui-ethernet-demos       \
                                     \
-    matrix-hmi-demo-evse            \
-    matrix-hmi-demo-protection-relays \
-    matrix-hmi-demo-mmwavegesture   \
-                                    \
     ${MATRIX_OPENCV_ARM_ONLY_APPS}  \
 "
 
@@ -128,10 +135,6 @@ MATRIX_APPS_append_ti43x = "        \
     matrix-gui-clocks               \
     matrix-gui-pm-demos-governor    \
                                     \
-                                    \
-    matrix-hmi-demo-evse            \
-    matrix-hmi-demo-mmwavegesture   \
-                                    \
     ${MATRIX_OPENCV_ARM_ONLY_APPS}  \
 "
 
@@ -139,8 +142,6 @@ MATRIX_APPS_append_omap-a15 = "     \
     matrix-multimedia-demo-aac      \
     matrix-multimedia-demo-audiocapture \
     matrix-multimedia-demo-h265dec  \
-    matrix-hmi-demo-evse            \
-    matrix-hmi-demo-mmwavegesture   \
                                     \
     ${@bb.utils.contains('MACHINE_FEATURES','mmip','matrix-multimedia-demo-ivahdh264dec','matrix-multimedia-demo-h264dec',d)} \
     ${@bb.utils.contains('MACHINE_FEATURES','mmip','matrix-multimedia-demo-ivahdh264enc','',d)} \
@@ -165,9 +166,6 @@ MATRIX_APPS_append_am65xx = "           \
     matrix-multimedia-demo-mpeg4aacdec \
     matrix-multimedia-demo-mpeg4dec \
                                     \
-    matrix-hmi-demo-evse            \
-    matrix-hmi-demo-mmwavegesture   \
-                                    \
     ${MATRIX_OPENCV_ARM_ONLY_APPS}  \
 "
 
-- 
2.31.1

Re: [dunfell/master][PATCH 0/6] Install qt based demos on machine feature check

[Denys Dmytriyenko]

The series looks good to me.

On Wed, May 05, 2021 at 09:58:06PM -0500, Gowtham Tammana wrote:
> The following demo packages are qt based and have a dependency on it, so they
> have to be installed conditionally on the machine feature gpu presence. This
> series add those changes to ensure dependencies are populated correctly for
> different sdk images.
> 
>   - pdm-anomaly-detection
>   - matrix-analytics-pdm-anomaly-detection
>   - dual-camera-demo
>   - matrix-gui-apps-dual-camera
>   - image-gallery
>   - matrix-gui-apps-image-gallery
>   - evse-hmi
>   - matrix-hmi-demo-evse
>   - matrix-hmi-demo-mmwavegesture
>   - matrix-hmi-demo-protection-relays
> 
> Gowtham Tammana (6):
>   ti-demos: Add feature check for pdm demos
>   packagegroup-arago-tisdk*: add feature check for pdm-anomaly-detection
>   packagegroup-arago-tisdk*: Add feature depenendency for
>     dual-camera-demo
>   packagegroups-arago-tisdk*: image-gallery: Add machine feature
>     conditional
>   tisdk-core-bundle: Conditionally install the hmi demos
>   packagegroup-arago-tisdk-hmi*: Install them conditionally
> 
>  .../recipes-core/images/tisdk-core-bundle.inc |  2 +-
>  ...ackagegroup-arago-tisdk-addons-sdk-host.bb | 12 +++--
>  ...kagegroup-arago-tisdk-addons-sdk-target.bb | 13 +++--
>  .../packagegroup-arago-tisdk-hmi-sdk-host.bb  |  4 +-
>  .../packagegroup-arago-tisdk-hmi.bb           |  4 +-
>  .../packagegroup-arago-tisdk-matrix.bb        | 51 +++++++++++--------
>  ...gegroup-arago-tisdk-multimedia-sdk-host.bb | 11 ++--
>  .../packagegroup-arago-tisdk-multimedia.bb    | 11 ++--
>  .../recipes-core/packagegroups/ti-demos.bb    | 10 ++--
>  9 files changed, 73 insertions(+), 45 deletions(-)
> 
> -- 
> 2.31.1

-- 
Regards,
Denys Dmytriyenko <denis@denix.org>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186  6D76 4209 0272 9A92 C964