From: Denys Dmytriyenko <[email protected]>
Signed-off-by: Denys Dmytriyenko <[email protected]>
---
.../packagegroup-arago-tisdk-addons-sdk-target.bb | 12 +++++++-----
.../packagegroups/packagegroup-arago-tisdk-addons.bb | 12 +++++++-----
.../packagegroups/packagegroup-arago-tisdk-matrix.bb | 19 ++++++++++---------
3 files changed, 24 insertions(+), 19 deletions(-)
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 b347880..77ddbe1 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
@@ -1,6 +1,6 @@
DESCRIPTION = "Task to install headers and libraries related to addons into
the SDK"
LICENSE = "MIT"
-PR = "r40"
+PR = "r41"
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -153,21 +153,23 @@ EXTRA_LIBS_append_k2e = " libulm-staticdev \
gdbserver-c6x-dev \
"
+ARMNN_PACKAGES = "armnn-dev"
+
EXTRA_PACKAGES = ""
EXTRA_PACKAGES_append_ti33x = " voxelsdk-dev \
arm-compute-library-dev \
- armnn-dev \
+ ${ARMNN_PACKAGES} \
"
EXTRA_PACKAGES_append_ti43x = " voxelsdk-dev \
arm-compute-library-dev \
- armnn-dev \
+ ${ARMNN_PACKAGES} \
"
EXTRA_PACKAGES_append_omap-a15 = " voxelsdk-dev \
arm-compute-library-dev \
- armnn-dev \
+ ${ARMNN_PACKAGES} \
"
EXTRA_PACKAGES_append_k3 = " arm-compute-library-dev \
- armnn-dev \
+ ${ARMNN_PACKAGES} \
"
IPCDEV = " \
diff --git
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
index e394846..11e41f7 100644
---
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
+++
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Task to install additional utilities/demos for SDKs"
LICENSE = "MIT"
-PR = "r71"
+PR = "r72"
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -144,25 +144,27 @@ EXTRA_PACKAGES_omapl138 = " \
protobuf \
"
+ARMNN_PACKAGES = "armnn"
+
EXTRA_PACKAGES_append_ti33x = " voxelsdk \
arm-compute-library \
- armnn \
+ ${ARMNN_PACKAGES} \
"
EXTRA_PACKAGES_append_ti43x = " voxelsdk \
arm-compute-library \
- armnn \
+ ${ARMNN_PACKAGES} \
"
EXTRA_PACKAGES_append_omap-a15 = " voxelsdk \
big-data-ipc-demo-linux \
big-data-ipc-demo-linux-firmware \
arm-compute-library \
- armnn \
+ ${ARMNN_PACKAGES} \
"
EXTRA_PACKAGES_append_k3 = " arm-compute-library \
- armnn \
+ ${ARMNN_PACKAGES} \
"
EXTRA_PACKAGES_append_omap-a15 = " ti-ipc-examples-linux"
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 5ddaa9f..530f70c 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
@@ -1,6 +1,6 @@
DESCRIPTION = "Task to include Matrix v2"
LICENSE = "MIT"
-PR = "r76"
+PR = "r77"
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -86,6 +86,11 @@ MATRIX_OPENCV_OPENCL_APPS_omap-a15 = " \
matrix-machinevision-demo-simplepeopletracking \
"
+MATRIX_ARMNN_APPS = " \
+ matrix-armnn-demo-staticimg \
+ matrix-armnn-demo-livecam \
+"
+
MATRIX_APPS = ""
MATRIX_APPS_append_ti33x = " \
@@ -107,8 +112,7 @@ MATRIX_APPS_append_ti33x = " \
\
${MATRIX_OPENCV_ARM_ONLY_APPS} \
\
- matrix-armnn-demo-staticimg \
- matrix-armnn-demo-livecam \
+ ${MATRIX_ARMNN_APPS} \
"
MATRIX_APPS_append_ti43x = " \
@@ -130,8 +134,7 @@ MATRIX_APPS_append_ti43x = " \
\
${MATRIX_OPENCV_ARM_ONLY_APPS} \
\
- matrix-armnn-demo-staticimg \
- matrix-armnn-demo-livecam \
+ ${MATRIX_ARMNN_APPS} \
"
MATRIX_APPS_append_omap-a15 = " \
@@ -152,8 +155,7 @@ MATRIX_APPS_append_omap-a15 = " \
matrix-gui-pm-demos-governor \
${@['','matrix-gui-browser-demos'][bb.utils.contains('MACHINE_FEATURES','sgx',True,False,d)
and bb.utils.contains('DISTRO_FEATURES','wayland',True,False,d)]} \
\
- matrix-armnn-demo-staticimg \
- matrix-armnn-demo-livecam \
+ ${MATRIX_ARMNN_APPS} \
"
MATRIX_APPS_append_k3 = " \
@@ -167,8 +169,7 @@ MATRIX_APPS_append_k3 = " \
\
${MATRIX_OPENCV_ARM_ONLY_APPS} \
\
- matrix-armnn-demo-staticimg \
- matrix-armnn-demo-livecam \
+ ${MATRIX_ARMNN_APPS} \
"
MATRIX_APPS_append_dra7xx += " \
--
2.7.4
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
