[zeus/master][PATCH 1/9] arago-tiny-image: make it tinier by removing non essential packages

All of lore.kernel.org
 help / color / mirror / Atom feed

* [zeus/master][PATCH 1/9] arago-tiny-image: make it tinier by removing non essential packages
@ 2020-02-29 16:14 Denys Dmytriyenko
  2020-02-29 16:14 ` [zeus/master][PATCH 2/9] images: combine tisdk-rootfs-image with "server" Denys Dmytriyenko
                   ` (7 more replies)
  0 siblings, 8 replies; 9+ messages in thread
From: Denys Dmytriyenko @ 2020-02-29 16:14 UTC (permalink / raw)
  To: meta-arago

From: Denys Dmytriyenko <denys@ti.com>

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 meta-arago-distro/recipes-core/images/arago-tiny-image.bb | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/meta-arago-distro/recipes-core/images/arago-tiny-image.bb b/meta-arago-distro/recipes-core/images/arago-tiny-image.bb
index 5d1733e..cac37a5 100644
--- a/meta-arago-distro/recipes-core/images/arago-tiny-image.bb
+++ b/meta-arago-distro/recipes-core/images/arago-tiny-image.bb
@@ -2,17 +2,11 @@ ARAGO_SYSVINIT = "1"
 
 require arago-image.inc
 
+IMAGE_FEATURES_remove = "package-management splash"
+
 IMAGE_FSTYPES += "cpio"
 
-# Install a small set of utils which can be used for diagnostics
-ARAGO_TINY_IMAGE_EXTRA_INSTALL ?= " \
-	parted \
-	util-linux \
-	e2fsprogs \
-	dosfstools \
-	devmem2 \
-	arago-feed-config \
-"
+ARAGO_TINY_IMAGE_EXTRA_INSTALL ?= ""
 
 IMAGE_INSTALL = " \
 	packagegroup-arago-sysvinit-boot \
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [zeus/master][PATCH 2/9] images: combine tisdk-rootfs-image with "server"
  2020-02-29 16:14 [zeus/master][PATCH 1/9] arago-tiny-image: make it tinier by removing non essential packages Denys Dmytriyenko
@ 2020-02-29 16:14 ` Denys Dmytriyenko
  2020-02-29 16:14 ` [zeus/master][PATCH 3/9] ti-world: list of packages to populate feeds Denys Dmytriyenko
                   ` (6 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: Denys Dmytriyenko @ 2020-02-29 16:14 UTC (permalink / raw)
  To: meta-arago

From: Denys Dmytriyenko <denys@ti.com>

Guard some tasks based on MACHINE_FEATURES, like "gpu", "dsp", etc.

Also, temporarily remove arago-tiny-image from the bundle, as it lacks package
management and fails to generate the software manifest.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 .../images/arago-core-tisdk-bundle.inc             |  6 +-----
 .../recipes-core/images/arago-image.inc            |  1 +
 .../recipes-core/images/tisdk-rootfs-image.bb      | 13 ++++++++---
 .../images/tisdk-server-rootfs-image.bb            | 25 ----------------------
 4 files changed, 12 insertions(+), 33 deletions(-)
 delete mode 100644 meta-arago-distro/recipes-core/images/tisdk-server-rootfs-image.bb

diff --git a/meta-arago-distro/recipes-core/images/arago-core-tisdk-bundle.inc b/meta-arago-distro/recipes-core/images/arago-core-tisdk-bundle.inc
index 7740467..ca3b694 100644
--- a/meta-arago-distro/recipes-core/images/arago-core-tisdk-bundle.inc
+++ b/meta-arago-distro/recipes-core/images/arago-core-tisdk-bundle.inc
@@ -32,15 +32,11 @@ DTB_FILTER_am65xx = "am65"
 DTB_FILTER_j7-evm = "j721e"
 
 # List of target side images to build for the SDK
-TARGET_IMAGES = "arago-base-tisdk-image tisdk-rootfs-image arago-tiny-image"
+TARGET_IMAGES = "arago-base-tisdk-image tisdk-rootfs-image"
 
 # dra71 lcard requires an initramfs with modules for NFS boot
 TARGET_IMAGES_append_dra7xx-evm = " netboot-initrd"
 
-# Some devices do not support display and use a server image instead
-TARGET_IMAGES_keystone = "arago-base-tisdk-image tisdk-server-rootfs-image arago-tiny-image"
-TARGET_IMAGES_omapl138 = "arago-base-tisdk-image tisdk-server-rootfs-image arago-tiny-image"
-
 TISDK_TOOLCHAIN = "meta-toolchain-arago-tisdk"
 TOOLCHAIN_SUFFIX = "-tisdk"
 
diff --git a/meta-arago-distro/recipes-core/images/arago-image.inc b/meta-arago-distro/recipes-core/images/arago-image.inc
index b197dc2..e068287 100644
--- a/meta-arago-distro/recipes-core/images/arago-image.inc
+++ b/meta-arago-distro/recipes-core/images/arago-image.inc
@@ -11,6 +11,7 @@ EXTRA_IMAGECMD_ext2.gz += "-i 4096"
 
 IMAGE_INSTALL = " \
 	packagegroup-core-boot \
+	${VIRTUAL-RUNTIME_initramfs} \
 	${CORE_IMAGE_EXTRA_INSTALL} \
 "
 
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 bb2515a..54771c1 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
@@ -2,6 +2,8 @@
 
 require arago-image.inc
 
+SPLASH = "${@bb.utils.contains('MACHINE_FEATURES','gpu','psplash','',d)}"
+
 IMAGE_INSTALL += "\
     packagegroup-arago-base \
     packagegroup-arago-console \
@@ -10,7 +12,7 @@ IMAGE_INSTALL += "\
     packagegroup-arago-test-addons \
     ${@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','gpu','packagegroup-arago-tisdk-qte','',d)} \
     ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl','',d)} \
     ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl-extra','',d)} \
     packagegroup-arago-tisdk-connectivity \
@@ -21,7 +23,12 @@ IMAGE_INSTALL += "\
     packagegroup-arago-tisdk-amsdk \
     packagegroup-arago-tisdk-addons \
     packagegroup-arago-tisdk-addons-extra \
-    packagegroup-arago-tisdk-hmi \
-    "
+    ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-hmi','packagegroup-arago-base-tisdk-server-extra',d)} \
+"
 
 export IMAGE_BASENAME = "tisdk-rootfs-image"
+
+# Disable ubi/ubifs as the filesystem requires more space than is
+# available on the HW.
+IMAGE_FSTYPES_remove_keystone = "ubifs ubi"
+IMAGE_FSTYPES_remove_omapl138 = "ubifs ubi"
diff --git a/meta-arago-distro/recipes-core/images/tisdk-server-rootfs-image.bb b/meta-arago-distro/recipes-core/images/tisdk-server-rootfs-image.bb
deleted file mode 100644
index 7c52e39..0000000
--- a/meta-arago-distro/recipes-core/images/tisdk-server-rootfs-image.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-# Arago TI SDK filesystem image
-
-require arago-base-tisdk-image.bb
-
-SPLASH = ""
-
-IMAGE_INSTALL += "\
-    packagegroup-arago-tisdk-addons \
-    packagegroup-arago-tisdk-addons-extra \
-    ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl','',d)} \
-    ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl-extra','',d)} \
-    packagegroup-arago-tisdk-crypto \
-    packagegroup-arago-tisdk-multimedia \
-    packagegroup-arago-tisdk-matrix \
-    packagegroup-arago-tisdk-matrix-extra \
-    packagegroup-arago-base-tisdk-server-extra \
-    packagegroup-arago-tisdk-connectivity \
-    packagegroup-arago-test-addons \
-"
-
-export IMAGE_BASENAME = "tisdk-server-rootfs-image"
-
-# Disable ubi/ubifs as the filesystem requires more space than is
-# available on the HW.
-IMAGE_FSTYPES_remove = "ubifs ubi"
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [zeus/master][PATCH 3/9] ti-world: list of packages to populate feeds
  2020-02-29 16:14 [zeus/master][PATCH 1/9] arago-tiny-image: make it tinier by removing non essential packages Denys Dmytriyenko
  2020-02-29 16:14 ` [zeus/master][PATCH 2/9] images: combine tisdk-rootfs-image with "server" Denys Dmytriyenko
@ 2020-02-29 16:14 ` Denys Dmytriyenko
  2020-02-29 16:14 ` [zeus/master][PATCH 4/9] opencl: major refactor Denys Dmytriyenko
                   ` (5 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: Denys Dmytriyenko @ 2020-02-29 16:14 UTC (permalink / raw)
  To: meta-arago

From: Denys Dmytriyenko <denys@ti.com>

As ti-world contains everything from default rootfs plus more, shrink down
default rootfs by dropping following piece:
* OpenCL-extra
* Build essentials and other devtools
* valgrind
* qt-opencv-opencl-opengl-multithreaded-dev
* qt3d-examples
* qtwebengine and qtbrowser
* Introduce "misc" packagegroup

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 .../recipes-core/images/tisdk-rootfs-image.bb      |  1 -
 .../packagegroups/packagegroup-arago-misc.bb       | 11 +++++
 .../packagegroups/packagegroup-arago-qte.bb        |  8 ----
 .../packagegroup-arago-tisdk-addons.bb             |  9 -----
 .../packagegroup-arago-tisdk-multimedia.bb         |  1 -
 .../packagegroups/packagegroup-arago-tisdk-qte.bb  | 10 -----
 .../ti-world.bb}                                   | 47 ++++++++++++++++------
 7 files changed, 46 insertions(+), 41 deletions(-)
 create mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-misc.bb
 copy meta-arago-distro/recipes-core/{images/tisdk-rootfs-image.bb => packagegroups/ti-world.bb} (52%)

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 54771c1..3efb578 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
@@ -14,7 +14,6 @@ IMAGE_INSTALL += "\
     ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-gtk','',d)} \
     ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-qte','',d)} \
     ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl','',d)} \
-    ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl-extra','',d)} \
     packagegroup-arago-tisdk-connectivity \
     packagegroup-arago-tisdk-crypto \
     packagegroup-arago-tisdk-matrix \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-misc.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-misc.bb
new file mode 100644
index 0000000..091d728
--- /dev/null
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-misc.bb
@@ -0,0 +1,11 @@
+SUMMARY = "Task to install additional miscellaneous packages"
+LICENSE = "MIT"
+PR = "r0"
+
+inherit packagegroup
+
+RDEPENDS_${PN} = "\
+    nano \
+    mc \
+    rsync \
+"
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb
index 5984fee..bf8124d 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb
@@ -41,19 +41,11 @@ QT5_ESSENTIALS = "\
     qtvirtualkeyboard-plugins \
     qtvirtualkeyboard-qmlplugins \
     qtwebkit-qmlplugins \
-    qtwebengine-qmlplugins \
     liberation-fonts \
     qtconnectivity \
     qtconnectivity-qmlplugins \
 "
 
-#QT5_ESSENTIALS_append_k3 = "\
-#    qtwebkit-qmlplugins \
-#"
-#QT5_ESSENTIALS_remove_k3 = "\
-#    qtwebengine-qmlplugins \
-#"
-
 RDEPENDS_${PN} = "\
     ${@oe.utils.conditional('QT_PROVIDER', 'qt5', "${QT5_ESSENTIALS}", "${QT4_ESSENTIALS}", d)} \
 "
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 4e1e404..af2c254 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
@@ -23,7 +23,6 @@ UTILS = " \
     libdrm-kms \
     kms++ \
     kms++-python \
-    ${@bb.utils.contains('TUNE_FEATURES', 'armv7a', 'valgrind', '', d)} \
     stream \
     strongswan \
     kexec \
@@ -130,13 +129,6 @@ EXTRA_LIBS_append_ti33x = " \
     uio-module-drv \
 "
 
-DEVTOOLS = " \
-    linux-libc-headers-dev \
-    packagegroup-core-buildessential \
-    packagegroup-core-tools-debug \
-    git \
-"
-
 EXTRA_PACKAGES = " \
     nodejs \
     nodejs-npm \
@@ -197,7 +189,6 @@ EXTRA_PACKAGES_append_k2g-evm  = " pruss-lld-apps"
 RDEPENDS_${PN} = "\
     ${UTILS} \
     ${UTILS_UBOOT_FW} \
-    ${DEVTOOLS} \
     ${EXTRA_LIBS} \
 "
 
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb
index f8e3954..d230b44 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb
@@ -29,7 +29,6 @@ MULTIMEDIA_append_omap-a15 = " \
 MULTIMEDIA_append_dra7xx = " \
     vis \
     hevc-arm-decoder \
-    ${@bb.utils.contains('MACHINE_FEATURES', 'dsp', 'qt-opencv-opencl-opengl-multithreaded-dev', '', d)} \
 "
 
 MULTIMEDIA_append_omap5-evm = " \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
index 5250d61..f83ac52 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
@@ -13,7 +13,6 @@ QT4_DEMOS = "\
 "
 
 QT5_DEMOS = "\
-    qt3d-examples \
     qtbase-examples \
     qtdeclarative-examples \
     qtdeclarative-tools \
@@ -22,19 +21,10 @@ QT5_DEMOS = "\
     qtscript-examples \
     qtsvg-examples \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland-examples', '', d)} \
-    qtwebengine-examples \
-    qtwebbrowser \
-    qtwebbrowser-examples \
     qtserialport-examples \
     qtcharts-examples \
 "
 
-#QT5_DEMOS_remove_k3 = "\
-#    qtwebbrowser \
-#    qtwebbrowser-examples \
-#    qtwebengine-examples \
-#"
-
 QT_DEMOS = "\
     qt-tstat \
 "
diff --git a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb b/meta-arago-distro/recipes-core/packagegroups/ti-world.bb
similarity index 52%
copy from meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
copy to meta-arago-distro/recipes-core/packagegroups/ti-world.bb
index 54771c1..1d5e286 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/ti-world.bb
@@ -1,10 +1,34 @@
-# Arago TI SDK full filesystem image
+SUMMARY = "TI World packagegroup"
+LICENSE = "MIT"
 
-require arago-image.inc
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-SPLASH = "${@bb.utils.contains('MACHINE_FEATURES','gpu','psplash','',d)}"
+inherit packagegroup
 
-IMAGE_INSTALL += "\
+INSANE_SKIP_${PN} += "dev-deps"
+
+CHROMIUM = ""
+#CHROMIUM_append_omap-a15 = "\
+#    chromium-ozone-wayland \
+#"
+#CHROMIUM_append_k3 = "\
+#    chromium-ozone-wayland \
+#"
+
+EXTRABROWSERS = " \
+    qtwebbrowser-examples \
+    qtwebengine-qmlplugins \
+    qtwebengine-examples \
+"
+
+DEVTOOLS = " \
+    linux-libc-headers-dev \
+    packagegroup-core-buildessential \
+    packagegroup-core-tools-debug \
+    git \
+"
+
+RDEPENDS_${PN} = "\
     packagegroup-arago-base \
     packagegroup-arago-console \
     packagegroup-arago-base-tisdk \
@@ -12,7 +36,7 @@ IMAGE_INSTALL += "\
     packagegroup-arago-test-addons \
     ${@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)} \
+    ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-qte qt3d-examples','',d)} \
     ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl','',d)} \
     ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl-extra','',d)} \
     packagegroup-arago-tisdk-connectivity \
@@ -24,11 +48,10 @@ IMAGE_INSTALL += "\
     packagegroup-arago-tisdk-addons \
     packagegroup-arago-tisdk-addons-extra \
     ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-hmi','packagegroup-arago-base-tisdk-server-extra',d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', "${CHROMIUM}", '', d)} \
+    ${@bb.utils.contains('MACHINE_FEATURES','gpu',"${EXTRABROWSERS}",'',d)} \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'gpu dsp', 'qt-opencv-opencl-opengl-multithreaded-dev', '', d)} \
+    ${DEVTOOLS} \
+    ${@bb.utils.contains('TUNE_FEATURES', 'armv7a', 'valgrind', '', d)} \
+    packagegroup-arago-misc \
 "
-
-export IMAGE_BASENAME = "tisdk-rootfs-image"
-
-# Disable ubi/ubifs as the filesystem requires more space than is
-# available on the HW.
-IMAGE_FSTYPES_remove_keystone = "ubifs ubi"
-IMAGE_FSTYPES_remove_omapl138 = "ubifs ubi"
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [zeus/master][PATCH 4/9] opencl: major refactor
  2020-02-29 16:14 [zeus/master][PATCH 1/9] arago-tiny-image: make it tinier by removing non essential packages Denys Dmytriyenko
  2020-02-29 16:14 ` [zeus/master][PATCH 2/9] images: combine tisdk-rootfs-image with "server" Denys Dmytriyenko
  2020-02-29 16:14 ` [zeus/master][PATCH 3/9] ti-world: list of packages to populate feeds Denys Dmytriyenko
@ 2020-02-29 16:14 ` Denys Dmytriyenko
  2020-02-29 16:14 ` [zeus/master][PATCH 5/9] ti-opencl: add aliases for opencl and opencl-runtime Denys Dmytriyenko
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: Denys Dmytriyenko @ 2020-02-29 16:14 UTC (permalink / raw)
  To: meta-arago

From: Jacob Stiffler <j-stiffler@ti.com>

For opencl, use the runtime package to pull in the minimal set of
dependencies needed to run opencl applications. The applications must
use precompiled kernels. Use the main package to pull in the full set
of tools, including clocl and the accelerator toolchains.

For the opencl-examples, the offline-compile package are the examples
which provide precompiled kernels, and thus require the minimum set of
dependencies. The runtime-compile package requires the kernels to be
compiled during runtime, and thus require the full set of opencl
tools, including clocl.

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 .../packagegroup-arago-tisdk-opencl.bb             |  6 +--
 meta-arago-extras/conf/layer.conf                  |  1 -
 meta-arago-extras/recipes-ti/ocl/clocl_git.bb      |  1 +
 .../recipes-ti/ocl/opencl-examples_git.bb          | 47 +++++++++++++++++++---
 meta-arago-extras/recipes-ti/ocl/opencl_git.bb     | 33 ++++++++-------
 5 files changed, 61 insertions(+), 27 deletions(-)

diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl.bb
index c1ef8ae..c357f9c 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl.bb
@@ -9,13 +9,10 @@ inherit packagegroup
 PACKAGES =+ "${PN}-extra"
 
 MAIN_PKGS = " \
-    opencl-examples \
+    opencl-examples-offline-compile \
 "
 
 EXTRA_PKGS = " \
-    opencl-staticdev \
-    opencl-examples-dev \
-    openmpacc-examples-dev \
     python-pyopencl \
 "
 
@@ -27,7 +24,6 @@ EXTRA_PKGS_append_k2hk = " \
 #    ti-fftw-examples
 EXTRA_PKGS_append_dra7xx = " \
     linalg-examples \
-    opencl-examples \
     kaldi \
 "
 
diff --git a/meta-arago-extras/conf/layer.conf b/meta-arago-extras/conf/layer.conf
index 02ffb8a..88fbaf9 100644
--- a/meta-arago-extras/conf/layer.conf
+++ b/meta-arago-extras/conf/layer.conf
@@ -41,5 +41,4 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
 SIGGEN_EXCLUDERECIPES_ABISAFE += " \
     ipsecmgr-mod \
     gstreamer1.0-plugins-bad \
-    opencl \
 "
diff --git a/meta-arago-extras/recipes-ti/ocl/clocl_git.bb b/meta-arago-extras/recipes-ti/ocl/clocl_git.bb
index c7f467f..df77d7e 100644
--- a/meta-arago-extras/recipes-ti/ocl/clocl_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl/clocl_git.bb
@@ -31,4 +31,5 @@ do_install() {
   install -m 755 ${S}/clocl/${TARGET}/clocl ${D}${bindir}
 }
 
+RDEPENDS_${PN} += "ti-cgt6x"
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
index 4732c73..bb7ff83 100644
--- a/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
@@ -5,7 +5,7 @@ LICENSE = "BSD"
 include ocl.inc
 require recipes-ti/includes/ti-paths.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 COMPATIBLE_MACHINE = "dra7xx|keystone"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -16,12 +16,30 @@ OCL_PERSISTENT_DEPENDS = "ti-xdctools-native ti-ipc-rtos ti-sysbios"
 
 DEPENDS_append_dra7xx = " ${OCL_PERSISTENT_DEPENDS}"
 
-RDEPENDS_${PN} += " opencl-runtime"
-RDEPENDS_${PN}-dev += " libgomp-dev"
+# Split examples into two groups:
+# - offline-compile: examples who's kernels are precompiled (offline).
+# - runtime-compile: examples who's kernels are compiled during runtime.
+PACKAGES =+ "${PN}-runtime-compile ${PN}-runtime-compile-dbg ${PN}-offline-compile ${PN}-offline-compile-dbg"
+
+RDEPENDS_${PN} = "${PN}-runtime-compile ${PN}-offline-compile"
+RDEPENDS_${PN}-dev += "libgomp-dev"
+RDEPENDS_${PN}-offline-compile += "opencl-runtime"
+RDEPENDS_${PN}-runtime-compile += "opencl"
 
 S = "${WORKDIR}/git/opencl_example_src"
 B = "${S}"
 
+OCL_RUNTIME_COMPILE_EXAMPLE_LIST = " \
+    ccode \
+    null \
+    ooo_callback \
+    simple \
+    vecadd \
+    vecadd_openmp \
+    vecadd_openmp_t \
+    vecadd_subdevice \
+"
+
 OCL_EXAMPLE_LIST = " abort_exit \
                      buffer \
                      ccode \
@@ -100,12 +118,29 @@ do_install() {
     done
 }
 
-FILES_${PN} += "\
-    ${datadir}/ti/examples/opencl \
+# First package the examples which require run-time kernel compilation.
+FILES_${PN}-runtime-compile += "\
+    ${@' '.join(['${datadir}/ti/examples/opencl/' + example for example in d.getVar('OCL_RUNTIME_COMPILE_EXAMPLE_LIST').split()])} \
+"
+
+FILES_${PN}-runtime-compile-dbg += "\
+    ${@' '.join(['${datadir}/ti/examples/opencl/' + example + '/.debug' for example in d.getVar('OCL_RUNTIME_COMPILE_EXAMPLE_LIST').split()])} \
+"
+
+# Remaining examples will fall through to the "offline" package.
+FILES_${PN}-offline-compile += "\
+    ${datadir}/ti/examples/opencl/ \
 "
 
-FILES_${PN}-dbg += "\
+FILES_${PN}-offline-compile-dbg += "\
     ${datadir}/ti/examples/opencl/*/.debug \
 "
 
+# Add makefiles to dev package
+FILES_${PN}-dev = "${datadir}/ti/examples/opencl/Makefile \
+                   ${datadir}/ti/examples/opencl/make.inc"
+
+ALLOW_EMPTY_${PN} = "1"
 INSANE_SKIP_${PN} = "arch ldflags textrel staticdev"
+INSANE_SKIP_${PN}-offline-compile = "arch ldflags textrel staticdev"
+INSANE_SKIP_${PN}-runtime-compile = "arch ldflags textrel staticdev"
diff --git a/meta-arago-extras/recipes-ti/ocl/opencl_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
index 69f9330..48bbc02 100644
--- a/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
@@ -4,17 +4,23 @@ LICENSE = "BSD"
 
 include ocl.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.3"
 
 inherit cmake systemd
 
 COMPATIBLE_MACHINE = "dra7xx|keystone"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
+# Define runtime package for minimal dependencies to run opencl applications
+# which precompile the offloaded kernels. The base package will provide the
+# ability to compile kernels (clocl) during runtime.
 PACKAGES =+ "${PN}-runtime"
 
+MONITORS                      = " opencl-monitor"
+MONITORS_append_dra7xx        = " opencl-monitor-ipu"
+
 DEPENDS = " ocl-gl-headers \
-            opencl-monitor \
+            ${MONITORS} \
             cmake-native \
             cmem \
             ti-llvm3.6 \
@@ -31,20 +37,16 @@ DEPENDS = " ocl-gl-headers \
             json-c \
 "
 
-DEPENDS_append_dra7xx   = " ti-ipc virtual/kernel"
+DEPENDS_append_dra7xx = " ti-ipc virtual/kernel"
 DEPENDS_append_keystone = " mpm-transport multiprocmgr"
 DEPENDS_remove_k2g = " libulm"
 
-MONITORS                      = " opencl-monitor"
-MONITORS_append_am57xx-evm    = " opencl-monitor-ipu"
-MONITORS_append_am57xx-hs-evm = " opencl-monitor-ipu"
-MONITORS_append_dra7xx        = " opencl-monitor-ipu"
-
-RDEPENDS_${PN} += " bash"
-RDEPENDS_${PN}-dev += " ocl-gl-headers-dev opencl-monitor"
-RDEPENDS_${PN}-runtime += " ${PN} ${MONITORS} clocl ti-cgt6x"
+RDEPENDS_${PN}-runtime += "bash ${MONITORS}"
+RDEPENDS_${PN}-dev += "ocl-gl-headers-dev"
+RDEPENDS_${PN} += "${PN}-runtime clocl bash"
 
-ALLOW_EMPTY_${PN}-runtime = "1"
+# Use main package to pull in full support
+ALLOW_EMPTY_${PN} = "1"
 
 S = "${WORKDIR}/git/host"
 
@@ -73,10 +75,11 @@ do_install_append() {
     install -m0644 ${MCTD} ${D}${systemd_system_unitdir}/ti-mct-daemon.service
 }
 
-SYSTEMD_SERVICE_${PN} = "ti-mct-daemon.service"
-SYSTEMD_AUTO_ENABLE_${PN} = "${@oe.utils.conditional("RESERVE_CMEM", "1", "enable", "disable", d)}"
+SYSTEMD_PACKAGES = "${PN}-runtime"
+SYSTEMD_SERVICE_${PN}-runtime = "ti-mct-daemon.service"
+SYSTEMD_AUTO_ENABLE_${PN}-runtime = "${@oe.utils.conditional("RESERVE_CMEM", "1", "enable", "disable", d)}"
 
-FILES_${PN}-runtime += "${bindir}"
+FILES_${PN}-runtime += "${bindir} ${systemd_system_unitdir} ${sysconfdir}/ti-mctd ${libdir}/lib*${SOLIBS}"
 
 FILES_${PN} += " \
     ${datadir}/ti/opencl/* \
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [zeus/master][PATCH 5/9] ti-opencl: add aliases for opencl and opencl-runtime
  2020-02-29 16:14 [zeus/master][PATCH 1/9] arago-tiny-image: make it tinier by removing non essential packages Denys Dmytriyenko
                   ` (2 preceding siblings ...)
  2020-02-29 16:14 ` [zeus/master][PATCH 4/9] opencl: major refactor Denys Dmytriyenko
@ 2020-02-29 16:14 ` Denys Dmytriyenko
  2020-02-29 16:14 ` [zeus/master][PATCH 6/9] build-essential: add a debian-named alias for OE packagegroup Denys Dmytriyenko
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: Denys Dmytriyenko @ 2020-02-29 16:14 UTC (permalink / raw)
  To: meta-arago

From: Denys Dmytriyenko <denys@ti.com>

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 meta-arago-distro/recipes-core/packagegroups/ti-opencl.bb | 12 ++++++++++++
 meta-arago-distro/recipes-core/packagegroups/ti-world.bb  |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 meta-arago-distro/recipes-core/packagegroups/ti-opencl.bb

diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-opencl.bb b/meta-arago-distro/recipes-core/packagegroups/ti-opencl.bb
new file mode 100644
index 0000000..20abf17
--- /dev/null
+++ b/meta-arago-distro/recipes-core/packagegroups/ti-opencl.bb
@@ -0,0 +1,12 @@
+# This is just an alias between debian and OE names
+
+LICENSE = "MIT"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+inherit packagegroup
+
+PACKAGES += "${PN}-runtime"
+
+RDEPENDS_${PN} = "opencl"
+RDEPENDS_${PN}-runtime = "opencl-runtime"
diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-world.bb b/meta-arago-distro/recipes-core/packagegroups/ti-world.bb
index 1d5e286..95a8cca 100644
--- a/meta-arago-distro/recipes-core/packagegroups/ti-world.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/ti-world.bb
@@ -37,7 +37,7 @@ RDEPENDS_${PN} = "\
     ${@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)} \
-    ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl','',d)} \
+    ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl ti-opencl','',d)} \
     ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl-extra','',d)} \
     packagegroup-arago-tisdk-connectivity \
     packagegroup-arago-tisdk-crypto \
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [zeus/master][PATCH 6/9] build-essential: add a debian-named alias for OE packagegroup
  2020-02-29 16:14 [zeus/master][PATCH 1/9] arago-tiny-image: make it tinier by removing non essential packages Denys Dmytriyenko
                   ` (3 preceding siblings ...)
  2020-02-29 16:14 ` [zeus/master][PATCH 5/9] ti-opencl: add aliases for opencl and opencl-runtime Denys Dmytriyenko
@ 2020-02-29 16:14 ` Denys Dmytriyenko
  2020-02-29 16:14 ` [zeus/master][PATCH 7/9] ti-test: combine and rename arago-test and arago-test-addons Denys Dmytriyenko
                   ` (2 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: Denys Dmytriyenko @ 2020-02-29 16:14 UTC (permalink / raw)
  To: meta-arago

From: Denys Dmytriyenko <denys@ti.com>

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 meta-arago-distro/recipes-core/packagegroups/build-essential.bb | 7 +++++++
 meta-arago-distro/recipes-core/packagegroups/ti-world.bb        | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 meta-arago-distro/recipes-core/packagegroups/build-essential.bb

diff --git a/meta-arago-distro/recipes-core/packagegroups/build-essential.bb b/meta-arago-distro/recipes-core/packagegroups/build-essential.bb
new file mode 100644
index 0000000..c50053a
--- /dev/null
+++ b/meta-arago-distro/recipes-core/packagegroups/build-essential.bb
@@ -0,0 +1,7 @@
+# This is just an alias between debian and OE names
+
+LICENSE = "MIT"
+
+inherit packagegroup
+
+RDEPENDS_${PN} = "packagegroup-core-buildessential"
diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-world.bb b/meta-arago-distro/recipes-core/packagegroups/ti-world.bb
index 95a8cca..ce94572 100644
--- a/meta-arago-distro/recipes-core/packagegroups/ti-world.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/ti-world.bb
@@ -23,7 +23,7 @@ EXTRABROWSERS = " \
 
 DEVTOOLS = " \
     linux-libc-headers-dev \
-    packagegroup-core-buildessential \
+    build-essential \
     packagegroup-core-tools-debug \
     git \
 "
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [zeus/master][PATCH 7/9] ti-test: combine and rename arago-test and arago-test-addons
  2020-02-29 16:14 [zeus/master][PATCH 1/9] arago-tiny-image: make it tinier by removing non essential packages Denys Dmytriyenko
                   ` (4 preceding siblings ...)
  2020-02-29 16:14 ` [zeus/master][PATCH 6/9] build-essential: add a debian-named alias for OE packagegroup Denys Dmytriyenko
@ 2020-02-29 16:14 ` Denys Dmytriyenko
  2020-02-29 16:14 ` [zeus/master][PATCH 8/9] ti-analytics, ti-demos: create initial packagegroups Denys Dmytriyenko
  2020-02-29 16:14 ` [zeus/master][PATCH 9/9] opkg-bash-completion: add bash-completions for opkg Denys Dmytriyenko
  7 siblings, 0 replies; 9+ messages in thread
From: Denys Dmytriyenko @ 2020-02-29 16:14 UTC (permalink / raw)
  To: meta-arago

From: Denys Dmytriyenko <denys@ti.com>

Also remove test package from base rootfs

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 .../recipes-core/images/arago-base-tisdk-image.bb  |  1 -
 .../recipes-core/images/tisdk-rootfs-image.bb      |  3 +-
 .../packagegroups/packagegroup-arago-test.bb       | 92 --------------------
 ...ackagegroup-arago-test-addons.bb => ti-test.bb} | 98 +++++++++++++++++++---
 .../recipes-core/packagegroups/ti-world.bb         |  3 +-
 5 files changed, 89 insertions(+), 108 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/arago-base-tisdk-image.bb b/meta-arago-distro/recipes-core/images/arago-base-tisdk-image.bb
index e926724..ebb1d42 100644
--- a/meta-arago-distro/recipes-core/images/arago-base-tisdk-image.bb
+++ b/meta-arago-distro/recipes-core/images/arago-base-tisdk-image.bb
@@ -10,7 +10,6 @@ IMAGE_INSTALL += "\
     packagegroup-arago-base \
     packagegroup-arago-console \
     packagegroup-arago-base-tisdk \
-    packagegroup-arago-test \
     ${VIRTUAL-RUNTIME_initramfs} \
     "
 
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 3efb578..fe894d4 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 066bdf8..0000000
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-test.bb
+++ /dev/null
@@ -1,92 +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 \
-"
-
-# timestamping
-ARAGO_TI_TEST = " \
-    ltp-ddt \
-    input-utils \
-    cpuloadgen \
-    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_k3 = " \
-    k3conf \
-"
-
-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..500d3a9 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 \
+"
+
+#    timestamping
+ARAGO_TI_TEST = " \
+    ltp-ddt \
+    input-utils \
+    cpuloadgen \
+    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 ce94572..345a06e 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



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [zeus/master][PATCH 8/9] ti-analytics, ti-demos: create initial packagegroups
  2020-02-29 16:14 [zeus/master][PATCH 1/9] arago-tiny-image: make it tinier by removing non essential packages Denys Dmytriyenko
                   ` (5 preceding siblings ...)
  2020-02-29 16:14 ` [zeus/master][PATCH 7/9] ti-test: combine and rename arago-test and arago-test-addons Denys Dmytriyenko
@ 2020-02-29 16:14 ` Denys Dmytriyenko
  2020-02-29 16:14 ` [zeus/master][PATCH 9/9] opkg-bash-completion: add bash-completions for opkg Denys Dmytriyenko
  7 siblings, 0 replies; 9+ messages in thread
From: Denys Dmytriyenko @ 2020-02-29 16:14 UTC (permalink / raw)
  To: meta-arago

From: Denys Dmytriyenko <denys@ti.com>

For now move armnn, tensorflow, voxelsdk and pdm-anomaly

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 .../recipes-core/images/tisdk-rootfs-image.bb      |  2 ++
 .../packagegroup-arago-tisdk-addons.bb             | 39 +++-------------------
 .../recipes-core/packagegroups/ti-analytics.bb     | 21 ++++++++++++
 .../recipes-core/packagegroups/ti-demos.bb         | 25 ++++++++++++++
 .../recipes-core/packagegroups/ti-world.bb         |  2 ++
 5 files changed, 55 insertions(+), 34 deletions(-)
 create mode 100644 meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb
 create mode 100644 meta-arago-distro/recipes-core/packagegroups/ti-demos.bb

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 fe894d4..7f8b508 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
@@ -22,6 +22,8 @@ IMAGE_INSTALL += "\
     packagegroup-arago-tisdk-addons \
     packagegroup-arago-tisdk-addons-extra \
     ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-hmi','packagegroup-arago-base-tisdk-server-extra',d)} \
+    ti-analytics \
+    ti-demos \
 "
 
 export IMAGE_BASENAME = "tisdk-rootfs-image"
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 af2c254..2913fa1 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
@@ -140,45 +140,16 @@ EXTRA_PACKAGES_omapl138 = " \
     protobuf \
 "
 
-ARMNN_PACKAGES = ""
-VOXEL_PACKAGES = ""
-#ARMNN_PACKAGES = "${@bb.utils.contains('MACHINE_FEATURES', 'dsp', 'armnn', '', d)}"
-#VOXEL_PACKAGES = "${@bb.utils.contains('MACHINE_FEATURES', 'dsp', 'voxelsdk', '', d)}"
-
-EXTRA_PACKAGES_append_ti33x = " ${VOXEL_PACKAGES} \
-                                arm-compute-library \
-                                ${ARMNN_PACKAGES} \
-                                tensorflow-lite-demo \
-                                pdm-anomaly-detection \
-"
-
-EXTRA_PACKAGES_append_ti43x = " ${VOXEL_PACKAGES} \
-                                arm-compute-library \
-                                ${ARMNN_PACKAGES} \
-                                tensorflow-lite-demo \
-                                pdm-anomaly-detection \
-"
-
-EXTRA_PACKAGES_append_omap-a15 = " ${VOXEL_PACKAGES} \
-                                   big-data-ipc-demo-linux \
-                                   big-data-ipc-demo-linux-firmware \
-                                   arm-compute-library \
-                                   ${ARMNN_PACKAGES} \
-                                   tensorflow-lite-demo \
-                                   pdm-anomaly-detection \
-"
-
-EXTRA_PACKAGES_append_am65xx = " arm-compute-library \
-                             ${ARMNN_PACKAGES} \
-                             tensorflow-lite-demo \
-                             pdm-anomaly-detection \
-"
-
 EXTRA_PACKAGES_append_omap-a15 = " ti-ipc-examples-linux"
 EXTRA_PACKAGES_append_keystone = " ti-ipc-examples-linux"
 EXTRA_PACKAGES_append_omapl138 = " ti-ipc-examples-linux"
 EXTRA_PACKAGES_append_am65xx = " ti-ipc-examples-linux"
 
+EXTRA_PACKAGES_append_omap-a15 = " \
+    big-data-ipc-demo-linux \
+    big-data-ipc-demo-linux-firmware \
+"
+
 # acontis-atemsys
 EXTRA_PACKAGES_append_am335x-evm = " pruss-lld-apps"
 EXTRA_PACKAGES_append_am437x-evm = " pruss-lld-apps"
diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb b/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb
new file mode 100644
index 0000000..ffed472
--- /dev/null
+++ b/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb
@@ -0,0 +1,21 @@
+SUMMARY = "TI World packagegroup"
+LICENSE = "MIT"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+inherit packagegroup
+
+ARMNN_PACKAGES = ""
+#ARMNN_PACKAGES = "${@bb.utils.contains('MACHINE_FEATURES', 'dsp', 'armnn', '', d)}"
+
+ANALYTICS = "\
+    ${ARMNN_PACKAGES} \
+    tensorflow-lite-demo \
+"
+ANALYTICS_keystone = ""
+ANALYTICS_j7-evm = ""
+ANALYTICS_omapl138 = ""
+
+RDEPENDS_${PN} = "\
+    ${ANALYTICS} \
+"
diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-demos.bb b/meta-arago-distro/recipes-core/packagegroups/ti-demos.bb
new file mode 100644
index 0000000..07c0b92
--- /dev/null
+++ b/meta-arago-distro/recipes-core/packagegroups/ti-demos.bb
@@ -0,0 +1,25 @@
+SUMMARY = "TI World packagegroup"
+LICENSE = "MIT"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+inherit packagegroup
+
+VOXEL_PKG = ""
+#VOXEL_PKG = "${@bb.utils.contains('MACHINE_FEATURES', 'dsp', 'voxelsdk', '', d)}"
+
+VOXELSDK = ""
+VOXELSDK_ti33x = "${VOXEL_PKG}"
+VOXELSDK_ti43x = "${VOXEL_PKG}"
+VOXELSDK_omap-a15 = "${VOXEL_PKG}"
+
+PDM_ANOMALY = ""
+PDM_ANOMALY_ti33x = "pdm-anomaly-detection"
+PDM_ANOMALY_ti43x = "pdm-anomaly-detection"
+PDM_ANOMALY_omap-a15 = "pdm-anomaly-detection"
+PDM_ANOMALY_am65xx = "pdm-anomaly-detection"
+
+RDEPENDS_${PN} = "\
+    ${VOXELSDK} \
+    ${PDM_ANOMALY} \
+"
diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-world.bb b/meta-arago-distro/recipes-core/packagegroups/ti-world.bb
index 345a06e..9244d49 100644
--- a/meta-arago-distro/recipes-core/packagegroups/ti-world.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/ti-world.bb
@@ -53,4 +53,6 @@ RDEPENDS_${PN} = "\
     ${DEVTOOLS} \
     ${@bb.utils.contains('TUNE_FEATURES', 'armv7a', 'valgrind', '', d)} \
     packagegroup-arago-misc \
+    ti-analytics \
+    ti-demos \
 "
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [zeus/master][PATCH 9/9] opkg-bash-completion: add bash-completions for opkg
  2020-02-29 16:14 [zeus/master][PATCH 1/9] arago-tiny-image: make it tinier by removing non essential packages Denys Dmytriyenko
                   ` (6 preceding siblings ...)
  2020-02-29 16:14 ` [zeus/master][PATCH 8/9] ti-analytics, ti-demos: create initial packagegroups Denys Dmytriyenko
@ 2020-02-29 16:14 ` Denys Dmytriyenko
  7 siblings, 0 replies; 9+ messages in thread
From: Denys Dmytriyenko @ 2020-02-29 16:14 UTC (permalink / raw)
  To: meta-arago

From: Jacob Stiffler <j-stiffler@ti.com>

* This is a simpe start to bash completions for opkg. Initialy, this can
  complete current supported verbs (static) and complete package names
  (dynamic).
* Use helpers (e.g. _init_completion, _count_args) to enhance usability
* Add support for search and flag verbs

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 .../packagegroups/packagegroup-arago-base.bb       |  1 +
 .../recipes-devtools/opkg/opkg-bash-completion.bb  | 17 +++++++
 .../opkg/opkg-bash-completion/opkg-bash-completion | 53 ++++++++++++++++++++++
 3 files changed, 71 insertions(+)
 create mode 100644 meta-arago-extras/recipes-devtools/opkg/opkg-bash-completion.bb
 create mode 100644 meta-arago-extras/recipes-devtools/opkg/opkg-bash-completion/opkg-bash-completion

diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base.bb
index 4094d90..e3f1916 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-base.bb
@@ -20,6 +20,7 @@ ARAGO_BASE = "\
     ethtool \
     thermal-init \
     bash \
+    opkg-bash-completion \
     udev-extraconf \
     "
 
diff --git a/meta-arago-extras/recipes-devtools/opkg/opkg-bash-completion.bb b/meta-arago-extras/recipes-devtools/opkg/opkg-bash-completion.bb
new file mode 100644
index 0000000..6055507
--- /dev/null
+++ b/meta-arago-extras/recipes-devtools/opkg/opkg-bash-completion.bb
@@ -0,0 +1,17 @@
+SUMMARY = "bash-completions for opkg"
+LICENSE = "MIT"
+
+PR = "r1"
+
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+SRC_URI = "file://opkg-bash-completion"
+
+do_install() {
+    install -d ${D}${datadir}/bash-completion/completions
+    install -m 0644 ${WORKDIR}/opkg-bash-completion \
+                    ${D}${datadir}/bash-completion/completions/opkg
+}
+
+FILES_${PN} = "${datadir}/bash-completion/completions/opkg"
+RDEPENDS_${PN} = "bash-completion"
diff --git a/meta-arago-extras/recipes-devtools/opkg/opkg-bash-completion/opkg-bash-completion b/meta-arago-extras/recipes-devtools/opkg/opkg-bash-completion/opkg-bash-completion
new file mode 100644
index 0000000..82b6c6f
--- /dev/null
+++ b/meta-arago-extras/recipes-devtools/opkg/opkg-bash-completion/opkg-bash-completion
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+# TBD: parse "opkg --help" to get this list
+OPKG_COMMANDS="update upgrade install configure remove clean flag list list-installed list-upgradable list-changed-conffiles files search find info status download compare-versions print-architecture depends whatdepends whatdependsrec whatrecommends whatsuggests whatprovides whatconflicts whatreplaces"
+OPKG_FLAGS="hold noprune user ok installed unpacked"
+OPKG_LONGOPTS="--help --verbosity --conf --dest --offline-root --add-arch --add-dest --add-exclude --add-ignore-recommends --prefer-arch-to-version --combine --force-depends --force-maintainer --force-reinstall --force-overwrite --force-downgrade --force-space --force-postinstall --force-remove --force-checksum --noaction --size --download-only --nodeps --no-install-recommends --force-removal-of-dependent-packages --autoremove --tmp-dir --lists-dir --cache-dir --host-cache-dir --volatile-cache"
+
+_opkg_completions() {
+    # Use this helpful helper to beautify things and catch vars and redirects
+    local cur prev words cword
+    _init_completion -s || return 0
+
+    # Catch options first
+    if [[ "$cur" == -* ]]
+    then
+        COMPREPLY=($(compgen -W "${OPKG_LONGOPTS}" -- "$cur"))
+        return
+    fi
+
+    # Now catch args
+    # opkg supports a single verb, so that will be the first arg,
+    local arg args
+    _get_first_arg
+    _count_args
+
+    case "$arg" in
+        install|files|info|status|download)
+            COMPREPLY=($(compgen -W "$(opkg list | sed -e 's| .*$||')" -- "$cur"));;
+        depends|whatdepends|whatdependsrec|whatrecommends|whatsuggests|whatprovides|whatconflicts|whatreplaces)
+            COMPREPLY=($(compgen -W "-A $(opkg list | sed -e 's| .*$||')" -- "$cur"));;
+        remove)
+            COMPREPLY=($(compgen -W "$(opkg list-installed | sed -e 's| .*$||')" -- "$cur"));;
+        upgrade)
+            COMPREPLY=($(compgen -W "$(opkg list-upgradable | sed -e 's| .*$||')" -- "$cur"));;
+        flag)
+            if [ $args -eq 2 ]
+            then
+                COMPREPLY=($(compgen -W "${OPKG_FLAGS}" "$cur"))
+            else
+                COMPREPLY=($(compgen -W "-A $(opkg list | sed -e 's| .*$||')" -- "$cur"))
+            fi
+            ;;
+        search)
+            # Only search for a single file
+            [ $args -gt 2 ] || _longopt;;
+        "")
+            COMPREPLY=($(compgen -W "${OPKG_COMMANDS}" -- "$cur"));;
+        *)
+            COMPREPLY=( "*" "I DONT KNOW WHAT TO DO!!!" )
+    esac
+}
+
+complete -F _opkg_completions opkg
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2020-02-29 16:17 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-29 16:14 [zeus/master][PATCH 1/9] arago-tiny-image: make it tinier by removing non essential packages Denys Dmytriyenko
2020-02-29 16:14 ` [zeus/master][PATCH 2/9] images: combine tisdk-rootfs-image with "server" Denys Dmytriyenko
2020-02-29 16:14 ` [zeus/master][PATCH 3/9] ti-world: list of packages to populate feeds Denys Dmytriyenko
2020-02-29 16:14 ` [zeus/master][PATCH 4/9] opencl: major refactor Denys Dmytriyenko
2020-02-29 16:14 ` [zeus/master][PATCH 5/9] ti-opencl: add aliases for opencl and opencl-runtime Denys Dmytriyenko
2020-02-29 16:14 ` [zeus/master][PATCH 6/9] build-essential: add a debian-named alias for OE packagegroup Denys Dmytriyenko
2020-02-29 16:14 ` [zeus/master][PATCH 7/9] ti-test: combine and rename arago-test and arago-test-addons Denys Dmytriyenko
2020-02-29 16:14 ` [zeus/master][PATCH 8/9] ti-analytics, ti-demos: create initial packagegroups Denys Dmytriyenko
2020-02-29 16:14 ` [zeus/master][PATCH 9/9] opkg-bash-completion: add bash-completions for opkg Denys Dmytriyenko

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.