From: Denys Dmytriyenko <[email protected]>
Signed-off-by: Denys Dmytriyenko <[email protected]>
---
.../recipes-core/images/tisdk-rootfs-image.bb | 3 +-
.../packagegroups/packagegroup-arago-test.bb | 88 -------------------
...ackagegroup-arago-test-addons.bb => ti-test.bb} | 98 +++++++++++++++++++---
.../recipes-core/packagegroups/ti-world.bb | 3 +-
4 files changed, 89 insertions(+), 103 deletions(-)
delete mode 100644
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-test.bb
rename
meta-arago-distro/recipes-core/packagegroups/{packagegroup-arago-test-addons.bb
=> ti-test.bb} (61%)
diff --git a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
b/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
index 4875624..1b2ffbd 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
@@ -8,8 +8,7 @@ IMAGE_INSTALL += "\
packagegroup-arago-base \
packagegroup-arago-console \
packagegroup-arago-base-tisdk \
- packagegroup-arago-test \
- packagegroup-arago-test-addons \
+ ti-test \
${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-graphics','',d)}
\
${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-gtk','',d)}
\
${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-qte','',d)}
\
diff --git
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-test.bb
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-test.bb
deleted file mode 100644
index 48ef5c0..0000000
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-test.bb
+++ /dev/null
@@ -1,88 +0,0 @@
-DESCRIPTION = "Extended task to get System Test specific apps"
-LICENSE = "MIT"
-PR = "r50"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-inherit packagegroup
-
-ARAGO_TEST = "\
- bonnie++ \
- hdparm \
- iozone3 \
- lmbench \
- rt-tests \
- evtest \
- bc \
- memtester \
- libdrm-tests \
- powertop \
- stress \
- stress-ng \
- yavta \
- rng-tools \
- perf \
- v4l-utils \
- smcroute \
- rwmem \
- pulseaudio-misc \
- kselftests \
- cpuset \
- procps \
- mtd-utils-ubifs-tests \
- pcitest \
- mstpd \
- fio \
- "
-
-ARAGO_TEST_append_armv7a = " \
- cpuburn-neon \
-"
-
-ARAGO_TEST_append_armv7ve = " \
- cpuburn-neon \
-"
-
-ARAGO_TI_TEST = " \
- ltp-ddt \
- input-utils \
- cpuloadgen \
- timestamping \
- uvc-gadget \
- "
-
-ARAGO_TI_TEST_append_ti33x = " \
- omapconf \
- "
-
-ARAGO_TI_TEST_append_ti43x = " \
- omapconf \
- "
-
-ARAGO_TI_TEST_append_omap-a15 = " \
- omapconf \
- ti-ipc-test \
- "
-
-ARAGO_TI_TEST_append_am65xx = " \
- ti-ipc-test \
- "
-
-ARAGO_TI_TEST_append_j7-evm = " \
- viddec-test-app \
- videnc-test-app \
- ufs-tool \
- "
-
-ARAGO_TI_TEST_append_keystone = " \
- ti-ipc-test \
- "
-
-ARAGO_TI_TEST_append_omapl138 = " \
- ti-ipc-test \
- "
-
-RDEPENDS_${PN} = "\
- ${ARAGO_TEST} \
- ${ARAGO_TI_TEST} \
- "
diff --git
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-test-addons.bb
b/meta-arago-distro/recipes-core/packagegroups/ti-test.bb
similarity index 61%
rename from
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-test-addons.bb
rename to meta-arago-distro/recipes-core/packagegroups/ti-test.bb
index 53954f7..e721360 100644
---
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-test-addons.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/ti-test.bb
@@ -1,28 +1,102 @@
-DESCRIPTION = "Task to install additional utilities/demos for test image"
+SUMMARY = "TI Testing packagegroup"
LICENSE = "MIT"
-LIC_FILES_CHKSUM =
"file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r14"
PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit packagegroup
+ARAGO_TEST = "\
+ bonnie++ \
+ hdparm \
+ iozone3 \
+ lmbench \
+ rt-tests \
+ evtest \
+ bc \
+ memtester \
+ libdrm-tests \
+ powertop \
+ stress \
+ stress-ng \
+ yavta \
+ rng-tools \
+ perf \
+ v4l-utils \
+ smcroute \
+ rwmem \
+ pulseaudio-misc \
+ kselftests \
+ cpuset \
+ procps \
+ mtd-utils-ubifs-tests \
+ pcitest \
+ mstpd \
+ fio \
+"
+
+ARAGO_TEST_append_armv7a = " \
+ cpuburn-neon \
+"
+
+ARAGO_TEST_append_armv7ve = " \
+ cpuburn-neon \
+"
+
+ARAGO_TI_TEST = " \
+ ltp-ddt \
+ input-utils \
+ cpuloadgen \
+ timestamping \
+ uvc-gadget \
+"
+
+ARAGO_TI_TEST_append_ti33x = " \
+ omapconf \
+"
+
+ARAGO_TI_TEST_append_ti43x = " \
+ omapconf \
+"
+
+ARAGO_TI_TEST_append_omap-a15 = " \
+ omapconf \
+ ti-ipc-test \
+"
+
+ARAGO_TI_TEST_append_am65xx = " \
+ ti-ipc-test \
+"
+
+ARAGO_TI_TEST_append_j7-evm = " \
+ viddec-test-app \
+ videnc-test-app \
+ ufs-tool \
+"
+
+ARAGO_TI_TEST_append_keystone = " \
+ ti-ipc-test \
+"
+
+ARAGO_TI_TEST_append_omapl138 = " \
+ ti-ipc-test \
+"
+
TEST_ADDONS = " \
bridge-utils \
linuxptp \
openntpd \
- "
+"
TEST_ADDONS_TI = ""
TEST_ADDONS_TI_append_ti43x = " \
cmem-test \
- "
+"
TEST_ADDONS_TI_append_omap-a15 = " \
${@bb.utils.contains('MACHINE_FEATURES', 'mmip', 'omapdrmtest', '', d)} \
cmem-test \
- "
+"
# Disable ipsecmgr due to libnl and xfrm conflict
# ipsecmgr
@@ -40,7 +114,7 @@ TEST_ADDONS_TI_append_keystone = " \
traceframework-test \
udma-test \
cmem-test \
- "
+"
# The following are not yet ready for k2g-evm
# nwal-lld-test
@@ -62,7 +136,7 @@ TEST_ADDONS_TI_append_k2hk = " \
hyplnk-lld-test \
mmap-lld-test \
aif2-lld-test \
- "
+"
# Disable netapi due to libnl and xfrm conflict
# netapi-test
@@ -74,7 +148,7 @@ TEST_ADDONS_TI_append_k2l = " \
dfe-lld-test \
iqn2-lld-test \
ipc-transport-qmss-test \
- "
+"
# Disable netapi due to libnl and xfrm conflict
# netapi-test
@@ -86,9 +160,11 @@ TEST_ADDONS_TI_append_k2e = " \
mmap-lld-test \
hyplnk-lld-test \
ipc-transport-qmss-test \
- "
+"
RDEPENDS_${PN} = "\
+ ${ARAGO_TEST} \
+ ${ARAGO_TI_TEST} \
${TEST_ADDONS} \
${TEST_ADDONS_TI} \
- "
+"
diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-world.bb
b/meta-arago-distro/recipes-core/packagegroups/ti-world.bb
index fcd3bed..1aa3a39 100644
--- a/meta-arago-distro/recipes-core/packagegroups/ti-world.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/ti-world.bb
@@ -32,8 +32,7 @@ RDEPENDS_${PN} = "\
packagegroup-arago-base \
packagegroup-arago-console \
packagegroup-arago-base-tisdk \
- packagegroup-arago-test \
- packagegroup-arago-test-addons \
+ ti-test \
${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-graphics','',d)}
\
${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-gtk','',d)}
\
${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-qte
qt3d-examples','',d)} \
--
2.7.4
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
