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 <[email protected]> --- ...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 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
