[PATCH 0/4] add MACHINE FEATURES condition sgx for additional modules and demos

[PATCH 0/4] add MACHINE FEATURES condition sgx for additional modules and demos

[Eric Ruei]

There are more modules and demos should not be included for non-sgx build
and therefore MACHINE FATURES condition (sgx) is added.

Eric Ruei (4):
  packagegroup-arago-tisdk-addons:add MACHINE FEATURES condition sgx for
    certain modules
  packagegroup-arago-tisdk-graphics: add MACHINE FEATURES condition sgx
    for certain modules
  packagegroup-arago-tisdk-matrix: add MACHINE FEATURES condition sgx
    for certain demos
  matrix-gui-machinevision-demos: add MACHINE FEATURES condition sgx for
    certain demos

 .../packagegroups/packagegroup-arago-tisdk-addons.bb |  4 ++--
 .../packagegroup-arago-tisdk-graphics.bb             | 12 ++++++------
 .../packagegroups/packagegroup-arago-tisdk-matrix.bb |  6 +++---
 .../matrix/matrix-gui-machinevision-demos_2.0.bb     |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

-- 
2.17.1

[PATCH 1/4] packagegroup-arago-tisdk-addons:add MACHINE FEATURES condition sgx for certain modules

[Eric Ruei]

-glsdk-example-apps needs sgx to be functional

Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
 .../packagegroups/packagegroup-arago-tisdk-addons.bb          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 abcf6bc7..60f8d4be 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 = "r73"
+PR = "r74"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -81,7 +81,7 @@ UTILS_append_omapl138 = " ti-ipc-rtos-fw"
 
 UTILS_append_dra7xx = " can-utils \
                         ${UTILS_DSP} \
-                        glsdk-example-apps \
+                        ${@bb.utils.contains('MACHINE_FEATURES','sgx','glsdk-example-apps','',d)} \
 "
 
 UTILS_append_keystone = " \
-- 
2.17.1

[PATCH 2/4] packagegroup-arago-tisdk-graphics: add MACHINE FEATURES condition sgx for certain modules

[Eric Ruei]

- The following modules all depend on sgx to be functional:
  chromium-wayland
  ti-sgx-ddk-km
  glmark2

Note: ti-sgx-ddk-um is still needed for build, but the libraries will not
      be invoked at run-time

Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
 .../packagegroup-arago-tisdk-graphics.bb             | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb
index e12c42aa..cb7f68bc 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task to install graphics binaries"
 LICENSE = "MIT"
-PR = "r22"
+PR = "r23"
 
 inherit packagegroup
 
@@ -12,25 +12,25 @@ GRAPHICS_WAYLAND = "\
 "
 
 GRAPHICS_WAYLAND_append_omap-a15 = "\
-    chromium-wayland \
+    ${@bb.utils.contains('MACHINE_FEATURES','sgx','chromium-wayland','',d)} \
 "
 
 GRAPHICS_WAYLAND_append_k3 = "\
-    chromium-wayland \
+    ${@bb.utils.contains('MACHINE_FEATURES','sgx','chromium-wayland','',d)} \
 "
 
 GRAPHICS_RDEPENDS = "\
     libgbm \
-    ti-sgx-ddk-km \
+    ${@bb.utils.contains('MACHINE_FEATURES','sgx','ti-sgx-ddk-km','',d)} \
     ti-sgx-ddk-um \
-    glmark2 \
+    ${@bb.utils.contains('MACHINE_FEATURES','sgx','glmark2','',d)} \
 "
 
 GRAPHICS_DISPLAY_UTILS = "\
 "
 
 GRAPHICS_DISPLAY_UTILS_append_omap-a15  = "\
-    glsdk-util-scripts \
+    ${@bb.utils.contains('MACHINE_FEATURES','sgx','glsdk-util-scripts','',d)} \
 "
 
 GRAPHICS_RDEPENDS_append_omap-a15 = "\
-- 
2.17.1

[PATCH 3/4] packagegroup-arago-tisdk-matrix: add MACHINE FEATURES condition sgx for certain demos

[Eric Ruei]

- Both thermostat and touch demos run with QPA eglfs which depends on sgx

Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
 .../packagegroups/packagegroup-arago-tisdk-matrix.bb        | 6 +++---
 1 file changed, 3 insertions(+), 3 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 2b7ee6de..612f66cf 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 = "r78"
+PR = "r79"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -36,11 +36,11 @@ MATRIX_QT_APPS = " \
     matrix-qt5-demo-webkit-browser \
     matrix-qt5-demo-calculator \
     matrix-qt5-demo-deform \
-    matrix-gui-thermostat-demo \
+    ${@bb.utils.contains('MACHINE_FEATURES','sgx','matrix-gui-thermostat-demo','',d)} \
 "
 
 MATRIX_TOUCH_APPS = " \
-    matrix-gui-touch-demos \
+    ${@bb.utils.contains('MACHINE_FEATURES','sgx','matrix-gui-touch-demos','',d)} \
 "
 
 MATRIX_QT_APPS_keystone = ""
-- 
2.17.1

[PATCH 4/4] matrix-gui-machinevision-demos: add MACHINE FEATURES condition sgx for certain demos

[Eric Ruei]

- point-cloud-viewer depends on sgx

Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
 .../recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bb
index 35cd630b..c316730f 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://gitorious.org/matrix-gui-v2/matrix-gui-v2-apps"
 
 require recipes-core/matrix/matrix-gui-apps-git.inc
 
-PR = "${INC_PR}.3"
+PR = "${INC_PR}.4"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -25,7 +25,7 @@ RDEPENDS_matrix-machinevision-demo-dlp3dscanner = " \
 "
 
 RDEPENDS_matrix-machinevision-demo-dlp3dscanner_append_dra7xx = " \
-    point-cloud-viewer \
+    ${@bb.utils.contains('MACHINE_FEATURES','sgx','point-cloud-viewer','',d)} \
 "
 
 RDEPENDS_matrix-machinevision-demo-barcoderoi = " \
-- 
2.17.1

Re: [PATCH 0/4] add MACHINE FEATURES condition sgx for additional modules and demos

[Denys Dmytriyenko]

Probably fine for now. I'm thinking we should group packagegroups slightly 
differently, so conditions like "sgx" can be done in one place, instead of 
sprinkling throughout the code...

Denys


On Fri, May 31, 2019 at 11:20:56AM -0400, Eric Ruei wrote:
> There are more modules and demos should not be included for non-sgx build
> and therefore MACHINE FATURES condition (sgx) is added.
> 
> Eric Ruei (4):
>   packagegroup-arago-tisdk-addons:add MACHINE FEATURES condition sgx for
>     certain modules
>   packagegroup-arago-tisdk-graphics: add MACHINE FEATURES condition sgx
>     for certain modules
>   packagegroup-arago-tisdk-matrix: add MACHINE FEATURES condition sgx
>     for certain demos
>   matrix-gui-machinevision-demos: add MACHINE FEATURES condition sgx for
>     certain demos
> 
>  .../packagegroups/packagegroup-arago-tisdk-addons.bb |  4 ++--
>  .../packagegroup-arago-tisdk-graphics.bb             | 12 ++++++------
>  .../packagegroups/packagegroup-arago-tisdk-matrix.bb |  6 +++---
>  .../matrix/matrix-gui-machinevision-demos_2.0.bb     |  4 ++--
>  4 files changed, 13 insertions(+), 13 deletions(-)
> 
> -- 
> 2.17.1
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago