Skip to contentSkip to conversation

recipes: rename "sgx" flag to "gpu" in MACHINE_FEATURES

PATCH New Denys Dmytriyenko 1 participant 1 message Jun 25, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 recipes: rename "sgx" flag to "gpu" in MACHINE_FEATURES

---
 .../recipes-core/images/arago-core-tisdk-image.inc           |  2 +-
 meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb  |  4 ++--
 .../packagegroups/packagegroup-arago-tisdk-addons.bb         |  2 +-
 .../packagegroups/packagegroup-arago-tisdk-graphics.bb       | 10 +++++-----
 .../packagegroups/packagegroup-arago-tisdk-matrix.bb         | 12 ++++++------
 .../packagegroup-arago-toolchain-tisdk-target.bb             |  4 ++--
 .../matrix/matrix-gui-machinevision-demos_2.0.bb             |  2 +-
 7 files changed, 18 insertions(+), 18 deletions(-)
meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc +1 -1
index 0125bb5..4b1a338 100644
@@ -64,7 +64,7 @@ IMAGE_INSTALL = "\
     packagegroup-arago-tisdk-addons-sdk-host \
     ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl-sdk-host','',d)} \
     packagegroup-arago-tisdk-crypto-sdk-host \
-    ${@bb.utils.contains('MACHINE_FEATURES','sgx','packagegroup-arago-tisdk-graphics-sdk-host','',d)} \
+    ${@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 \
meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb +2 -2
index 8486a8e..bb2515a 100644
@@ -8,8 +8,8 @@ IMAGE_INSTALL += "\
     packagegroup-arago-base-tisdk \
     packagegroup-arago-test \
     packagegroup-arago-test-addons \
-    ${@bb.utils.contains('MACHINE_FEATURES','sgx','packagegroup-arago-tisdk-graphics','',d)} \
-    ${@bb.utils.contains('MACHINE_FEATURES','sgx','packagegroup-arago-tisdk-gtk','',d)} \
+    ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-graphics','',d)} \
+    ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-gtk','',d)} \
     packagegroup-arago-tisdk-qte \
     ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl','',d)} \
     ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl-extra','',d)} \
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb +1 -1
index a7be94a..2521382 100644
@@ -80,7 +80,7 @@ UTILS_append_omapl138 = " ti-ipc-rtos-fw"
 
 UTILS_append_dra7xx = " can-utils \
                         ${UTILS_DSP} \
-                        ${@bb.utils.contains('MACHINE_FEATURES','sgx','glsdk-example-apps','',d)} \
+                        ${@bb.utils.contains('MACHINE_FEATURES','gpu','glsdk-example-apps','',d)} \
 "
 
 UTILS_append_keystone = " \
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb +5 -5
index aee7c3a..6a60375 100644
@@ -14,18 +14,18 @@ GRAPHICS_WAYLAND = "\
 "
 
 GRAPHICS_WAYLAND_append_omap-a15 = "\
-    ${@bb.utils.contains('MACHINE_FEATURES','sgx','chromium-wayland','',d)} \
+    ${@bb.utils.contains('MACHINE_FEATURES','gpu','chromium-wayland','',d)} \
 "
 
 GRAPHICS_WAYLAND_append_k3 = "\
-    ${@bb.utils.contains('MACHINE_FEATURES','sgx','chromium-wayland','',d)} \
+    ${@bb.utils.contains('MACHINE_FEATURES','gpu','chromium-wayland','',d)} \
 "
 
 GRAPHICS_RDEPENDS = "\
     libgbm \
     ${PREFERRED_PROVIDER_virtual/egl} \
-    ${@bb.utils.contains('MACHINE_FEATURES','sgx','${PREFERRED_PROVIDER_virtual/gpudriver}','',d)} \
-    ${@bb.utils.contains('MACHINE_FEATURES','sgx','glmark2','',d)} \
+    ${@bb.utils.contains('MACHINE_FEATURES','gpu','${PREFERRED_PROVIDER_virtual/gpudriver}','',d)} \
+    ${@bb.utils.contains('MACHINE_FEATURES','gpu','glmark2','',d)} \
 "
 GRAPHICS_RDEPENDS_remove_j7-evm = "ti-sgx-ddk-km"
 
@@ -33,7 +33,7 @@ GRAPHICS_DISPLAY_UTILS = "\
 "
 
 GRAPHICS_DISPLAY_UTILS_append_omap-a15  = "\
-    ${@bb.utils.contains('MACHINE_FEATURES','sgx','glsdk-util-scripts','',d)} \
+    ${@bb.utils.contains('MACHINE_FEATURES','gpu','glsdk-util-scripts','',d)} \
 "
 
 GRAPHICS_RDEPENDS_append_omap-a15 = "\
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb +6 -6
index 78f9c56..c2c5975 100644
@@ -37,11 +37,11 @@ MATRIX_QT_APPS = " \
     matrix-qt5-demo-webkit-browser \
     matrix-qt5-demo-calculator \
     matrix-qt5-demo-deform \
-    ${@bb.utils.contains('MACHINE_FEATURES','sgx','matrix-gui-thermostat-demo','',d)} \
+    ${@bb.utils.contains('MACHINE_FEATURES','gpu','matrix-gui-thermostat-demo','',d)} \
 "
 
 MATRIX_TOUCH_APPS = " \
-    ${@bb.utils.contains('MACHINE_FEATURES','sgx','matrix-gui-touch-demos','',d)} \
+    ${@bb.utils.contains('MACHINE_FEATURES','gpu','matrix-gui-touch-demos','',d)} \
 "
 
 MATRIX_QT_APPS_keystone = ""
@@ -53,7 +53,7 @@ MATRIX_QT_APPS_j7-evm = ""
 #    matrix-qt5-demo-webkit-browser \
 #"
 
-MATRIX_SGX_DEMOS = " \
+MATRIX_GPU_DEMOS = " \
     matrix-3d-demo-chameleon \
     matrix-3d-demo-coverflow \
     matrix-3d-demo-navigation \
@@ -61,7 +61,7 @@ MATRIX_SGX_DEMOS = " \
     matrix-3d-demo-kmscube \
 "
 
-MATRIX_SGX_DEMOS_append_omap-a15 = " \
+MATRIX_GPU_DEMOS_append_omap-a15 = " \
     matrix-3d-demo-kmscubevideo \
 "
 
@@ -165,7 +165,7 @@ MATRIX_APPS_append_omap-a15 = "     \
     matrix-analytics-pdm-anomaly-detection \
 "
 
-#    ${@['','matrix-gui-browser-demos'][bb.utils.contains('MACHINE_FEATURES','sgx',True,False,d) and bb.utils.contains('DISTRO_FEATURES','wayland',True,False,d)]} \
+#    ${@['','matrix-gui-browser-demos'][bb.utils.contains('MACHINE_FEATURES','gpu',True,False,d) and bb.utils.contains('DISTRO_FEATURES','wayland',True,False,d)]} \
 #                                \
 #
 
@@ -212,7 +212,7 @@ RDEPENDS_${PN} = "        \
     ${MATRIX_QT_APPS}     \
     ${MATRIX_TOUCH_APPS}  \
     ${MATRIX_APPS}        \
-    ${@bb.utils.contains('MACHINE_FEATURES','sgx',"${MATRIX_SGX_DEMOS}",'',d)} \
+    ${@bb.utils.contains('MACHINE_FEATURES','gpu',"${MATRIX_GPU_DEMOS}",'',d)} \
     ${@bb.utils.contains('MACHINE_FEATURES','dsp',"${MATRIX_OPENCL_APPS}",'',d)} \
 "
 
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb +2 -2
index 03c3f47..81299f0 100644
@@ -28,10 +28,10 @@ TISDK_TOOLCHAIN_EXTRA_TARGET_j7-evm = ""
 
 RDEPENDS_${PN} = "\
     ${QT_TOOLCHAIN_TARGET} \
-    ${@bb.utils.contains('MACHINE_FEATURES','sgx','packagegroup-arago-tisdk-gtk-sdk-target','',d)} \
+    ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-gtk-sdk-target','',d)} \
     ${TISDK_TOOLCHAIN_BASE_TARGET} \
     ${TISDK_TOOLCHAIN_EXTRA_TARGET} \
-    ${@bb.utils.contains('MACHINE_FEATURES','sgx','packagegroup-arago-tisdk-graphics-sdk-target','',d)} \
+    ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-graphics-sdk-target','',d)} \
     ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl-sdk-target','',d)} \
     packagegroup-arago-tisdk-addons-sdk-target \
 "
meta-arago-extras/recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bb +1 -1
index c316730..cadfefa 100644
@@ -25,7 +25,7 @@ RDEPENDS_matrix-machinevision-demo-dlp3dscanner = " \
 "
 
 RDEPENDS_matrix-machinevision-demo-dlp3dscanner_append_dra7xx = " \
-    ${@bb.utils.contains('MACHINE_FEATURES','sgx','point-cloud-viewer','',d)} \
+    ${@bb.utils.contains('MACHINE_FEATURES','gpu','point-cloud-viewer','',d)} \
 "
 
 RDEPENDS_matrix-machinevision-demo-barcoderoi = " \
Signature · 1 line
2.7.4