From patchwork Tue Jan 21 17:52:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 55901 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB70AC0218C for ; Tue, 21 Jan 2025 17:52:34 +0000 (UTC) Received: from lelvem-ot02.ext.ti.com (lelvem-ot02.ext.ti.com [198.47.23.235]) by mx.groups.io with SMTP id smtpd.web11.21964.1737481953949845763 for ; Tue, 21 Jan 2025 09:52:34 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=KpWQazdW; spf=pass (domain: ti.com, ip: 198.47.23.235, mailfrom: afd@ti.com) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by lelvem-ot02.ext.ti.com (8.15.2/8.15.2) with ESMTPS id 50LHqXXN046365 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 21 Jan 2025 11:52:33 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1737481953; bh=9zXOD+XkZSe6W4lLqWEd06lTuN9PrzzrCz1uyufXAYQ=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=KpWQazdWifFvBUx49K5nosmrjQ+7bT5S49rf3gfYKxIbb4xfSaZ6b017aBaZAnHPH LkD+aqtctyf/hPIZuc5VBTM7rPVd1QskfOzktfSX4hvwocMD4avu/Z/K1ybQZV7iCq 2Qom+9wo9pXRLEzDq4aw4J7Ej21Cp5WWJakyfw6s= Received: from DLEE112.ent.ti.com (dlee112.ent.ti.com [157.170.170.23]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTP id 50LHqXQP043544; Tue, 21 Jan 2025 11:52:33 -0600 Received: from DLEE109.ent.ti.com (157.170.170.41) by DLEE112.ent.ti.com (157.170.170.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Tue, 21 Jan 2025 11:52:32 -0600 Received: from lelvsmtp6.itg.ti.com (10.180.75.249) by DLEE109.ent.ti.com (157.170.170.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Tue, 21 Jan 2025 11:52:32 -0600 Received: from fllvsmtp8.itg.ti.com ([10.249.42.149]) by lelvsmtp6.itg.ti.com (8.15.2/8.15.2) with ESMTP id 50LHqV9B097709; Tue, 21 Jan 2025 11:52:32 -0600 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , CC: Andrew Davis Subject: [meta-arago][scarthgap/master][PATCH v2 4/7] opencv: Remove OpenCV customization and DISTRO_FEATURE Date: Tue, 21 Jan 2025 11:52:28 -0600 Message-ID: <20250121175231.27183-4-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250121175231.27183-1-afd@ti.com> References: <20250121175231.27183-1-afd@ti.com> MIME-Version: 1.0 X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 21 Jan 2025 17:52:34 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15723 These customizations are leftover from when we had DSP acceleration for OpenCV. Remove these. Also, If you need OpenCV for a package you should just DEPEND on it in the recipe, not check for it as a DISTRO_FEATURE. Fix that. This then means "opencv" is no longer used as a DISTRO_FEATURE anywhere in Arago or other lower layer, so drop it from DISTRO_FEATUREs. Signed-off-by: Andrew Davis --- Changes for v2: - Clarify commit message - point-cloud-viewer fix DEPENDS .../point-cloud-viewer/point-cloud-viewer_git.bb | 7 ++----- 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 --- .../recipes-support/opencv/opencv/setupEnv.sh | 2 -- meta-arago-distro/recipes-support/opencv/opencv_%.bbappend | 3 --- 7 files changed, 4 insertions(+), 22 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..9211c653 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" @@ -21,7 +17,8 @@ PV = "2.2" S = "${WORKDIR}/git" -RDEPENDS:${PN} = "opencv libxkbcommon" +DEPENDS += "opencv" +RDEPENDS:${PN} = "libxkbcommon" do_install() { install -d ${D}${bindir} 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"