diff mbox series

[meta-arago,master] Revert "tisdk-default-image: Add Matrix GUI only for legacy platforms"

Message ID 20231026165744.29731-1-reatmon@ti.com
State Superseded
Delegated to: Ryan Eatmon
Headers show
Series [meta-arago,master] Revert "tisdk-default-image: Add Matrix GUI only for legacy platforms" | expand

Commit Message

Ryan Eatmon Oct. 26, 2023, 4:57 p.m. UTC 
This reverts commit 35387dd8dbc438b759d8de1ae195664272af9cd3.

There is at least one script from this package that is needed by our
bigger testing flow.  We will need to rework the packages beling
excluded by this patch so that the testing can still work even if these
package groups are not included.
---
 .../recipes-core/images/tisdk-default-image.bb      | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)
diff mbox series

Patch

diff --git a/meta-arago-distro/recipes-core/images/tisdk-default-image.bb b/meta-arago-distro/recipes-core/images/tisdk-default-image.bb
index 0d2291b8..33ed0f57 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-default-image.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-default-image.bb
@@ -23,6 +23,8 @@  IMAGE_INSTALL += "\
     ${@['','packagegroup-arago-tisdk-opencl'][oe.utils.all_distro_features(d, 'opencl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \
     packagegroup-arago-tisdk-connectivity \
     packagegroup-arago-tisdk-crypto \
+    packagegroup-arago-tisdk-matrix \
+    packagegroup-arago-tisdk-matrix-extra \
     packagegroup-arago-tisdk-multimedia \
     packagegroup-arago-tisdk-addons \
     packagegroup-arago-tisdk-addons-extra \
@@ -33,16 +35,6 @@  IMAGE_INSTALL += "\
     packagegroup-arago-tisdk-sysrepo \
 "
 
-MATRIX_OOB = ""
-MATRIX_OOB:append:ti33x = " \
-    packagegroup-arago-tisdk-matrix \
-    packagegroup-arago-tisdk-matrix-extra \
-"
-MATRIX_OOB:append:ti43x = " \
-    packagegroup-arago-tisdk-matrix \
-    packagegroup-arago-tisdk-matrix-extra \
-"
-
 export IMAGE_BASENAME = "tisdk-default-image"
 
 # Disable ubi/ubifs as the filesystem requires more space than is
@@ -86,6 +78,5 @@  IMAGE_INSTALL += "\
     ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "${PYTHON2APPS}", "", d)} \
     ${DEVTOOLS} \
     ${@bb.utils.contains('TUNE_FEATURES', 'armv7a', 'valgrind', '', d)} \
-    ${MATRIX_OOB} \
     docker \
 "