diff mbox series

[meta-arago,master/kirktone] ti-test-extras: merge recipe with ti-test

Message ID 20230616154727.1329965-1-rs@ti.com
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series [meta-arago,master/kirktone] ti-test-extras: merge recipe with ti-test | expand

Commit Message

Randolph Sapp June 16, 2023, 3:47 p.m. UTC 
From: Randolph Sapp <rs@ti.com>

Merge the ti-test-extras recipe with ti-test.

Fixes:
8b957a07 (ti-test-extras: add package group for large tests, 2023-06-15)

Signed-off-by: Randolph Sapp <rs@ti.com>
---
 .../recipes-core/packagegroups/ti-test-extras.bb | 16 ----------------
 .../recipes-core/packagegroups/ti-test.bb        | 12 ++++++++++++
 2 files changed, 12 insertions(+), 16 deletions(-)
 delete mode 100644 meta-arago-distro/recipes-core/packagegroups/ti-test-extras.bb
diff mbox series

Patch

diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-test-extras.bb b/meta-arago-distro/recipes-core/packagegroups/ti-test-extras.bb
deleted file mode 100644
index 6d69b165..00000000
--- a/meta-arago-distro/recipes-core/packagegroups/ti-test-extras.bb
+++ /dev/null
@@ -1,16 +0,0 @@ 
-SUMMARY = "TI Testing packagegroup for big tests"
-LICENSE = "MIT"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-inherit packagegroup
-
-ARAGO_TEST_EXTRAS = "\
-    piglit \
-    ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "opengl-es-cts", "", d)} \
-    ${@bb.utils.contains("DISTRO_FEATURES", "vulkan", "vulkan-cts", "", d)} \
-"
-
-RDEPENDS:${PN} = "\
-    ${ARAGO_TEST_EXTRAS} \
-"
diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-test.bb b/meta-arago-distro/recipes-core/packagegroups/ti-test.bb
index 3e45077b..f97ad756 100644
--- a/meta-arago-distro/recipes-core/packagegroups/ti-test.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/ti-test.bb
@@ -40,6 +40,12 @@  ARAGO_TEST = "\
     cryptodev-tests \
 "
 
+ARAGO_TEST_EXTRAS = " \
+    piglit \
+    ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "opengl-es-cts", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "vulkan", "vulkan-cts", "", d)} \
+"
+
 ARAGO_TEST:append:armv7a = " \
     cpuburn-neon \
 "
@@ -97,3 +103,9 @@  RDEPENDS:${PN} = "\
     ${ARAGO_TEST} \
     ${ARAGO_TI_TEST} \
 "
+
+# Package group for things that should only be present in tisdk-default-image
+PACKAGES += " ${PN}-extras"
+RDEPENDS:${PN}-extras = "\
+    ${ARAGO_TEST_EXTRAS} \
+"