These customizations are leftover from when we had DSP acceleration for OpenCV. Also "opencv" is not a DISTRO_FEATURE, it is a regular library, if you need OpenCV for a package you should just DEPEND on it.
Signed-off-by: Andrew Davis <[email protected]> --- .../point-cloud-viewer/point-cloud-viewer_git.bb | 4 ---- meta-arago-distro/conf/distro/arago.conf | 5 ++--- .../recipes-support/opencv/opencv/am57xx-evm/setupEnv.sh | 3 --- .../recipes-support/opencv/opencv/dra7xx-evm/setupEnv.sh | 3 --- .../recipes-support/opencv/opencv/keystone/setupEnv.sh | 3 --- meta-arago-distro/recipes-support/opencv/opencv/setupEnv.sh | 2 -- meta-arago-distro/recipes-support/opencv/opencv_%.bbappend | 3 --- 7 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 meta-arago-distro/recipes-support/opencv/opencv/am57xx-evm/setupEnv.sh delete mode 100644 meta-arago-distro/recipes-support/opencv/opencv/dra7xx-evm/setupEnv.sh delete mode 100644 meta-arago-distro/recipes-support/opencv/opencv/keystone/setupEnv.sh delete mode 100644 meta-arago-distro/recipes-support/opencv/opencv/setupEnv.sh delete mode 100644 meta-arago-distro/recipes-support/opencv/opencv_%.bbappend diff --git a/meta-arago-demos/recipes-apps/point-cloud-viewer/point-cloud-viewer_git.bb b/meta-arago-demos/recipes-apps/point-cloud-viewer/point-cloud-viewer_git.bb index 0388a2e0..d08e0f6b 100644 --- a/meta-arago-demos/recipes-apps/point-cloud-viewer/point-cloud-viewer_git.bb +++ b/meta-arago-demos/recipes-apps/point-cloud-viewer/point-cloud-viewer_git.bb @@ -3,10 +3,6 @@ HOMEPAGE = "https://git.ti.com/processor-sdk/point-cloud-viewer/"; LICENSE = "TI-TSPA" LIC_FILES_CHKSUM := "file://PointCloudViewer_manifest.html;md5=7ea694db2dd8d82fd91a18cab8c2c2db" -inherit features_check - -REQUIRED_DISTRO_FEATURES = "opencv" - PR = "r2" COMPATIBLE_MACHINE = "dra7xx" diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf index f1948523..baa526a9 100644 --- a/meta-arago-distro/conf/distro/arago.conf +++ b/meta-arago-distro/conf/distro/arago.conf @@ -50,13 +50,12 @@ DISTRO_FEATURES:append = " pam wayland opengl" DISTRO_FEATURES:remove = "x11" #DISTRO_FEATURES:append = " opencl" DISTRO_FEATURES:append = " vulkan" -DISTRO_FEATURES:append = " opencv" DISTRO_FEATURES:append = " openmp" # Normally target distro features will not be applied to native builds: # Native distro features on this list will use the target feature value -DISTRO_FEATURES_FILTER_NATIVE:append = " opencl opencv openmp" -DISTRO_FEATURES_FILTER_NATIVESDK:append = " opencl opencv openmp" +DISTRO_FEATURES_FILTER_NATIVE:append = " opencl openmp" +DISTRO_FEATURES_FILTER_NATIVESDK:append = " opencl openmp" # Set global runtime providers for major components ARAGO_SYSVINIT ??= "0" diff --git a/meta-arago-distro/recipes-support/opencv/opencv/am57xx-evm/setupEnv.sh b/meta-arago-distro/recipes-support/opencv/opencv/am57xx-evm/setupEnv.sh deleted file mode 100644 index 3ad25601..00000000 --- a/meta-arago-distro/recipes-support/opencv/opencv/am57xx-evm/setupEnv.sh +++ /dev/null @@ -1,3 +0,0 @@ -export OPENCV_BUILDDIR=/usr/share/OpenCV/samples -export OPENCV_TEST_DATA_PATH=/usr/share/OpenCV/testdata -export OPENCV_OPENCL_DEVICE='TI AM57:ACCELERATOR:TI Multicore C66 DSP' diff --git a/meta-arago-distro/recipes-support/opencv/opencv/dra7xx-evm/setupEnv.sh b/meta-arago-distro/recipes-support/opencv/opencv/dra7xx-evm/setupEnv.sh deleted file mode 100644 index 3ad25601..00000000 --- a/meta-arago-distro/recipes-support/opencv/opencv/dra7xx-evm/setupEnv.sh +++ /dev/null @@ -1,3 +0,0 @@ -export OPENCV_BUILDDIR=/usr/share/OpenCV/samples -export OPENCV_TEST_DATA_PATH=/usr/share/OpenCV/testdata -export OPENCV_OPENCL_DEVICE='TI AM57:ACCELERATOR:TI Multicore C66 DSP' diff --git a/meta-arago-distro/recipes-support/opencv/opencv/keystone/setupEnv.sh b/meta-arago-distro/recipes-support/opencv/opencv/keystone/setupEnv.sh deleted file mode 100644 index 5b6bdb78..00000000 --- a/meta-arago-distro/recipes-support/opencv/opencv/keystone/setupEnv.sh +++ /dev/null @@ -1,3 +0,0 @@ -export OPENCV_BUILDDIR=/usr/share/OpenCV/samples -export OPENCV_TEST_DATA_PATH=/usr/share/OpenCV/testdata -export OPENCV_OPENCL_DEVICE='TI KeyStone II:ACCELERATOR:TI Multicore C66 DSP' diff --git a/meta-arago-distro/recipes-support/opencv/opencv/setupEnv.sh b/meta-arago-distro/recipes-support/opencv/opencv/setupEnv.sh deleted file mode 100644 index 5bf7afd3..00000000 --- a/meta-arago-distro/recipes-support/opencv/opencv/setupEnv.sh +++ /dev/null @@ -1,2 +0,0 @@ -export OPENCV_BUILDDIR=/usr/share/OpenCV/samples -export OPENCV_TEST_DATA_PATH=/usr/share/OpenCV/testdata diff --git a/meta-arago-distro/recipes-support/opencv/opencv_%.bbappend b/meta-arago-distro/recipes-support/opencv/opencv_%.bbappend deleted file mode 100644 index 2ee6bff7..00000000 --- a/meta-arago-distro/recipes-support/opencv/opencv_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -inherit features_check - -REQUIRED_DISTRO_FEATURES = "opencv" -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#15708): https://lists.yoctoproject.org/g/meta-arago/message/15708 Mute This Topic: https://lists.yoctoproject.org/mt/110674479/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
