diff mbox series

[master,RFC,02/16] packagegroup: remove opencl/openmp packagegroups

Message ID 20240805043713.172555-2-denis@denix.org
State RFC
Delegated to: Ryan Eatmon
Headers show
Series [master,RFC,01/16] ti-analytics: remove | expand

Commit Message

Denys Dmytriyenko Aug. 5, 2024, 4:36 a.m. UTC
From: Denys Dmytriyenko <denys@konsulko.com>

These packagegroups used to group together components for OpenCL/MP support
and related other libraries, which are being deprecated. Remove them first
for bisectability.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 .../images/tisdk-default-image.bb             |  7 -----
 ...kagegroup-arago-tisdk-opencl-sdk-target.bb | 22 -------------
 .../packagegroup-arago-tisdk-opencl.bb        | 31 -------------------
 ...ckagegroup-arago-toolchain-tisdk-target.bb |  1 -
 .../recipes-core/packagegroups/ti-opencl.bb   | 12 -------
 .../recipes-core/packagegroups/ti-world.bb    |  6 ----
 6 files changed, 79 deletions(-)
 delete mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl-sdk-target.bb
 delete mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl.bb
 delete mode 100644 meta-arago-distro/recipes-core/packagegroups/ti-opencl.bb
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 4b5697e5..faae53d3 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-default-image.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-default-image.bb
@@ -18,7 +18,6 @@  IMAGE_INSTALL += "\
     ${@bb.utils.contains('DISTRO_FEATURES','opengl','packagegroup-arago-tisdk-graphics','',d)} \
     ${@bb.utils.contains('DISTRO_FEATURES','opengl','packagegroup-arago-tisdk-gtk','',d)} \
     ${@bb.utils.contains('DISTRO_FEATURES','opengl','packagegroup-arago-tisdk-qte','',d)} \
-    ${@['','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-multimedia \
@@ -54,13 +53,7 @@  DEVTOOLS = " \
     dtc \
 "
 
-OPENCL = " \
-    ${@bb.utils.contains('MACHINE_FEATURES','dsp','ti-opencl','',d)} \
-    ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl-extra','',d)} \
-"
-
 IMAGE_INSTALL += "\
-    ${@oe.utils.all_distro_features(d, "opencl", "${OPENCL}")} \
     ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "${PYTHON2APPS}", "", d)} \
     ${DEVTOOLS} \
     ${@bb.utils.contains('TUNE_FEATURES', 'armv7a', 'valgrind', '', d)} \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl-sdk-target.bb
deleted file mode 100644
index b660fcb4..00000000
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl-sdk-target.bb
+++ /dev/null
@@ -1,22 +0,0 @@ 
-DESCRIPTION = "Task to install headers and libraries of OpenCL/MP and related components"
-LICENSE = "MIT"
-PR = "r2"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-inherit packagegroup features_check
-
-REQUIRED_DISTRO_FEATURES = "opencl"
-
-UTILS = " \
-    opencl-staticdev \
-    ${@oe.utils.all_distro_features(d, 'openmp', 'openmpacc-dev')} \
-"
-
-UTILS:append:dra7xx = " \
-    ${@oe.utils.all_distro_features(d, 'openmp', 'linalg-dev')} \
-"
-
-RDEPENDS:${PN} = "\
-    ${UTILS} \
-"
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
deleted file mode 100644
index 1aba3f7b..00000000
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl.bb
+++ /dev/null
@@ -1,31 +0,0 @@ 
-DESCRIPTION = "Task to install OpenCL/MP and related components"
-LICENSE = "MIT"
-PR = "r4"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-inherit packagegroup features_check
-
-REQUIRED_DISTRO_FEATURES = "opencl"
-
-PACKAGES =+ "${PN}-extra"
-
-MAIN_PKGS = " \
-    opencl-examples-offline-compile \
-"
-
-EXTRA_PKGS = " \
-"
-
-#    ti-fftw-examples
-EXTRA_PKGS:append:dra7xx = " \
-    ${@oe.utils.all_distro_features(d, 'openmp', 'linalg-examples')} \
-"
-
-RDEPENDS:${PN} = "\
-    ${MAIN_PKGS} \
-"
-
-RDEPENDS:${PN}-extra = "\
-    ${EXTRA_PKGS} \
-"
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb
index cdf54ecc..43cd9c59 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb
@@ -23,6 +23,5 @@  RDEPENDS:${PN} = "\
     ${TISDK_TOOLCHAIN_BASE_TARGET} \
     ${TISDK_TOOLCHAIN_EXTRA_TARGET} \
     ${@bb.utils.contains('DISTRO_FEATURES','opengl','packagegroup-arago-tisdk-graphics-sdk-target','',d)} \
-    ${@['','packagegroup-arago-tisdk-opencl-sdk-target'][oe.utils.all_distro_features(d, 'opencl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \
     packagegroup-arago-tisdk-addons-sdk-target \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-opencl.bb b/meta-arago-distro/recipes-core/packagegroups/ti-opencl.bb
deleted file mode 100644
index ecae271f..00000000
--- a/meta-arago-distro/recipes-core/packagegroups/ti-opencl.bb
+++ /dev/null
@@ -1,12 +0,0 @@ 
-# 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 5db67fdf..438dd8d0 100644
--- a/meta-arago-distro/recipes-core/packagegroups/ti-world.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/ti-world.bb
@@ -33,11 +33,6 @@  DEVTOOLS = " \
     git \
 "
 
-OPENCL = " \
-    ${@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)} \
-"
-
 RDEPENDS:${PN} = "\
     packagegroup-arago-base \
     packagegroup-arago-console \
@@ -45,7 +40,6 @@  RDEPENDS:${PN} = "\
     ${@bb.utils.contains('DISTRO_FEATURES','opengl','packagegroup-arago-tisdk-graphics','',d)} \
     ${@bb.utils.contains('DISTRO_FEATURES','opengl','packagegroup-arago-tisdk-gtk','',d)} \
     ${@bb.utils.contains('DISTRO_FEATURES','opengl','packagegroup-arago-tisdk-qte qt3d-examples','',d)} \
-    ${@oe.utils.all_distro_features(d, "opencl", "${OPENCL}")} \
     packagegroup-arago-tisdk-connectivity \
     packagegroup-arago-tisdk-crypto \
     packagegroup-arago-tisdk-multimedia \