From patchwork Fri Jan 17 21:19:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 55753 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 55905C0218B for ; Fri, 17 Jan 2025 21:20:03 +0000 (UTC) Received: from fllvem-ot04.ext.ti.com (fllvem-ot04.ext.ti.com [198.47.19.246]) by mx.groups.io with SMTP id smtpd.web10.5926.1737148794479019604 for ; Fri, 17 Jan 2025 13:19:54 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=o6ZigAbp; spf=pass (domain: ti.com, ip: 198.47.19.246, mailfrom: afd@ti.com) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllvem-ot04.ext.ti.com (8.15.2/8.15.2) with ESMTPS id 50HLJqIm261018 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 17 Jan 2025 15:19:52 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1737148793; bh=fSX9jGM54Mavd0M/h6ZufGrYjxEhDzUl8T3qh0zRLKo=; h=From:To:CC:Subject:Date; b=o6ZigAbp7IsQ2Eomhy+aGmlKVIodLxr8Eqsh9ZSxBd7w8KwQyjhCb2t2mTW35walt jjXC4YpDmRL3rEjXi8Cb1pQUWi9cEE77wscX8ksyQQHQjOQ6tpUUG2heSIcfMiBWUQ 50Z4aO9s5Sy8ubObQuXUkjOSyMq9Te2ML3OhzUJY= Received: from DFLE110.ent.ti.com (dfle110.ent.ti.com [10.64.6.31]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 50HLJqLw112891 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 17 Jan 2025 15:19:52 -0600 Received: from DFLE115.ent.ti.com (10.64.6.36) by DFLE110.ent.ti.com (10.64.6.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Fri, 17 Jan 2025 15:19:52 -0600 Received: from lelvsmtp5.itg.ti.com (10.180.75.250) by DFLE115.ent.ti.com (10.64.6.36) 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; Fri, 17 Jan 2025 15:19:51 -0600 Received: from fllvsmtp7.itg.ti.com ([10.249.42.149]) by lelvsmtp5.itg.ti.com (8.15.2/8.15.2) with ESMTP id 50HLJp5e030757; Fri, 17 Jan 2025 15:19:51 -0600 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , CC: Andrew Davis Subject: [meta-arago][scarthgap/master][PATCH 1/5] arago.conf: Remove old and unused config flags Date: Fri, 17 Jan 2025 15:19:47 -0600 Message-ID: <20250117211951.698377-1-afd@ti.com> X-Mailer: git-send-email 2.39.2 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 ; Fri, 17 Jan 2025 21:20:03 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15709 These are no longer used in any layer, remove these. Signed-off-by: Andrew Davis --- meta-arago-distro/conf/distro/arago.conf | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf index 8e094e02..6e8c6cb9 100644 --- a/meta-arago-distro/conf/distro/arago.conf +++ b/meta-arago-distro/conf/distro/arago.conf @@ -140,9 +140,6 @@ JH_RAMFS_IMAGE = "tisdk-jailhouse-inmate" # Enable UI and scripting for perf PERF_FEATURES_ENABLE ?= "perf-scripting perf-tui" -# Do not warn on meta-gnome w/o x11 -SKIP_META_GNOME_SANITY_CHECK = "1" - ARAGO_KERNEL_SUFFIX ?= "" ARAGO_IMAGE_SUFFIX ?= "" @@ -169,17 +166,9 @@ ARAGO_BRAND ??= "core" require conf/distro/include/branding-${ARAGO_BRAND}.inc -# Disable polkit's systemd configuration from meta-oe -POLKITAUTH = "" - # Disable meta-virtualization sanity check and warning SKIP_META_VIRT_SANITY_CHECK = "1" -# Set ENTERPRISE_DISTRO flag to ensure that recipes that have been flagged -# do not attempt to enable features that have potential commercial -# licensing issues. -ENTERPRISE_DISTRO = "1" - # oe-core uses external libav instead of internal libav for gst-ffmpeg. We # disable by default the codecs in libav that causes issues with shipping an # Arago based SDK. No need to prevent gst-ffmpeg from being used since we From patchwork Fri Jan 17 21:19:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 55752 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 5E7B9C0218C for ; Fri, 17 Jan 2025 21:20:03 +0000 (UTC) Received: from fllvem-ot03.ext.ti.com (fllvem-ot03.ext.ti.com [198.47.19.245]) by mx.groups.io with SMTP id smtpd.web10.5924.1737148794391935919 for ; Fri, 17 Jan 2025 13:19:54 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=Q3rTr1va; spf=pass (domain: ti.com, ip: 198.47.19.245, mailfrom: afd@ti.com) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllvem-ot03.ext.ti.com (8.15.2/8.15.2) with ESMTPS id 50HLJrel252447 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 17 Jan 2025 15:19:53 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1737148793; bh=MqhyvJFXwDA2U8ZKsmZ8ZoG1CxAVxXoCo9Y6pbs+HAA=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=Q3rTr1vabeF+SdRut4WTe2jPAqEeyeKetYobohPG6Vigc634Lt86z0y4JukQm0L2x 4iZnQZcPNZdzbMrGoPHe467mcRfPFRwV0i7cZDURa2QM7f1o1xbaUp3VQ1hOEweu2p gUzVsSzfyhIgbFFQlkXioTufCHFecLAZBw3NW58k= Received: from DLEE102.ent.ti.com (dlee102.ent.ti.com [157.170.170.32]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 50HLJqRh112894 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 17 Jan 2025 15:19:53 -0600 Received: from DLEE102.ent.ti.com (157.170.170.32) by DLEE102.ent.ti.com (157.170.170.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Fri, 17 Jan 2025 15:19:52 -0600 Received: from lelvsmtp5.itg.ti.com (10.180.75.250) by DLEE102.ent.ti.com (157.170.170.32) 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; Fri, 17 Jan 2025 15:19:52 -0600 Received: from fllvsmtp7.itg.ti.com ([10.249.42.149]) by lelvsmtp5.itg.ti.com (8.15.2/8.15.2) with ESMTP id 50HLJp5f030757; Fri, 17 Jan 2025 15:19:52 -0600 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , CC: Andrew Davis Subject: [meta-arago][scarthgap/master][PATCH 2/5] arago.conf: Remove leftover comments around security protections Date: Fri, 17 Jan 2025 15:19:48 -0600 Message-ID: <20250117211951.698377-2-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250117211951.698377-1-afd@ti.com> References: <20250117211951.698377-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 ; Fri, 17 Jan 2025 21:20:03 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15710 These flags, along with many more updated ones, can all be set using security_flags.inc from oe-core now. Signed-off-by: Andrew Davis --- meta-arago-distro/conf/distro/arago.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf index 6e8c6cb9..f1948523 100644 --- a/meta-arago-distro/conf/distro/arago.conf +++ b/meta-arago-distro/conf/distro/arago.conf @@ -153,10 +153,6 @@ ARAGO_SYSTEST_ENABLE ?= "0" ARAGO_KERNEL_SUFFIX:append = "${@oe.utils.conditional("ARAGO_SYSTEST_ENABLE", "1", "-systest", "", d)}" IMAGE_FSTYPES:remove = "${@['','ubi ubifs'][d.getVar('ARAGO_SYSTEST_ENABLE') == '1']}" -# Enable basic stack and buffer overflow protections -#TARGET_CPPFLAGS += "-fstack-protector -D_FORTIFY_SOURCE=1" -#TARGET_CPPFLAGS += "-fstack-protector" - # Load default preferences require conf/distro/include/arago-prefs.inc From patchwork Fri Jan 17 21:19:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 55750 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 480F8C0218A for ; Fri, 17 Jan 2025 21:20:03 +0000 (UTC) Received: from fllvem-ot04.ext.ti.com (fllvem-ot04.ext.ti.com [198.47.19.246]) by mx.groups.io with SMTP id smtpd.web10.5923.1737148794389701924 for ; Fri, 17 Jan 2025 13:19:54 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=G9jlWf9e; spf=pass (domain: ti.com, ip: 198.47.19.246, mailfrom: afd@ti.com) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllvem-ot04.ext.ti.com (8.15.2/8.15.2) with ESMTPS id 50HLJrOa261022 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 17 Jan 2025 15:19:53 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1737148793; bh=s7L/30V6ENuje9qJAbcCXgGvSCsFgO6rcGrGwJ875+A=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=G9jlWf9eeMf8ZOtSGTECON8fJoyv2wQhPS0sTt+gKSYrtniVVTE75nD2Cp7ocqyZB xmZLtl0/N/8p78gasnTmQS0JRVHXytTjN+/32oLguDMQfLU1Fm8X1Sgy4NR7aRIcBP ClVPMlJTUvXXwXYQ7O7eLwsODGSWFg88HDdDxFwk= Received: from DFLE101.ent.ti.com (dfle101.ent.ti.com [10.64.6.22]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 50HLJrMw112895 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 17 Jan 2025 15:19:53 -0600 Received: from DFLE104.ent.ti.com (10.64.6.25) by DFLE101.ent.ti.com (10.64.6.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Fri, 17 Jan 2025 15:19:52 -0600 Received: from lelvsmtp5.itg.ti.com (10.180.75.250) by DFLE104.ent.ti.com (10.64.6.25) 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; Fri, 17 Jan 2025 15:19:52 -0600 Received: from fllvsmtp7.itg.ti.com ([10.249.42.149]) by lelvsmtp5.itg.ti.com (8.15.2/8.15.2) with ESMTP id 50HLJp5g030757; Fri, 17 Jan 2025 15:19:52 -0600 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , CC: Andrew Davis Subject: [meta-arago][scarthgap/master][PATCH 3/5] arago-prefs.inc: Remove PREFERRED_PROVIDER for jpeg Date: Fri, 17 Jan 2025 15:19:49 -0600 Message-ID: <20250117211951.698377-3-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250117211951.698377-1-afd@ti.com> References: <20250117211951.698377-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 ; Fri, 17 Jan 2025 21:20:03 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15707 There is now only one provider for libjpeg, the other provider was dropped from oe-core ~10 years ago. Remove this very outdated PREFERRED_PROVIDER. Signed-off-by: Andrew Davis --- meta-arago-distro/conf/distro/include/arago-prefs.inc | 2 -- .../packagegroups/packagegroup-arago-standalone-sdk-target.bb | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/meta-arago-distro/conf/distro/include/arago-prefs.inc b/meta-arago-distro/conf/distro/include/arago-prefs.inc index a518a857..f8e39830 100644 --- a/meta-arago-distro/conf/distro/include/arago-prefs.inc +++ b/meta-arago-distro/conf/distro/include/arago-prefs.inc @@ -8,8 +8,6 @@ PREFERRED_PROVIDER_virtual/gettext = "gettext" PREFERRED_PROVIDER_virtual/kernel:append = "${ARAGO_KERNEL_SUFFIX}" -PREFERRED_PROVIDER_jpeg = "libjpeg-turbo" - # Setting PREFERRED_VERSIONS due to selecting a specific version of a library or # application that does not have a GPLv3 license PREFERRED_VERSION_crda = "3.18" diff --git a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-standalone-sdk-target.bb b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-standalone-sdk-target.bb index 9c5a2644..78ffe567 100644 --- a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-standalone-sdk-target.bb +++ b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-standalone-sdk-target.bb @@ -21,7 +21,7 @@ RDEPENDS:${PN} = "\ curl-dev \ i2c-tools-dev \ freetype-dev \ - ${@oe.utils.conditional('PREFERRED_PROVIDER_jpeg', 'libjpeg-turbo', 'libjpeg-turbo-dev', 'jpeg-dev', d)} \ + libjpeg-turbo-dev \ lzo-dev \ opkg-dev \ libpng-dev \ From patchwork Fri Jan 17 21:19:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 55751 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 4722BC02188 for ; Fri, 17 Jan 2025 21:20:03 +0000 (UTC) Received: from fllvem-ot03.ext.ti.com (fllvem-ot03.ext.ti.com [198.47.19.245]) by mx.groups.io with SMTP id smtpd.web10.5925.1737148794446347099 for ; Fri, 17 Jan 2025 13:19:54 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=pRlyzW86; spf=pass (domain: ti.com, ip: 198.47.19.245, mailfrom: afd@ti.com) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllvem-ot03.ext.ti.com (8.15.2/8.15.2) with ESMTPS id 50HLJrYf252451 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 17 Jan 2025 15:19:53 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1737148793; bh=wNWOaY86+gqoTr9ODlcjtK+025gA1Dhd6VUALLxanyQ=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=pRlyzW86yH3IfviK3kC5ByE7SKjktC4S1w6gL97zwQfGaUU4BOVdSsSBF3Xw3cX+I h96AOzKKPQIMnCYO6Aqvc+aoxEOQbadRJZzqn6X7HzrZVlXj2pflTE59oRFH2Jj6iX /WgAUBm2SZHX/icREvFrTtHLeKMEnZZc8b2QxuhI= Received: from DFLE114.ent.ti.com (dfle114.ent.ti.com [10.64.6.35]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 50HLJr9f112900 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 17 Jan 2025 15:19:53 -0600 Received: from DFLE113.ent.ti.com (10.64.6.34) by DFLE114.ent.ti.com (10.64.6.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Fri, 17 Jan 2025 15:19:52 -0600 Received: from lelvsmtp5.itg.ti.com (10.180.75.250) by DFLE113.ent.ti.com (10.64.6.34) 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; Fri, 17 Jan 2025 15:19:52 -0600 Received: from fllvsmtp7.itg.ti.com ([10.249.42.149]) by lelvsmtp5.itg.ti.com (8.15.2/8.15.2) with ESMTP id 50HLJp5h030757; Fri, 17 Jan 2025 15:19:52 -0600 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , CC: Andrew Davis Subject: [meta-arago][scarthgap/master][PATCH 4/5] opencv: Remove OpenCV customization and DISTRO_FEATURE Date: Fri, 17 Jan 2025 15:19:50 -0600 Message-ID: <20250117211951.698377-4-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250117211951.698377-1-afd@ti.com> References: <20250117211951.698377-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 ; Fri, 17 Jan 2025 21:20:03 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15708 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 --- .../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" From patchwork Fri Jan 17 21:19:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 55754 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 4643EC02183 for ; Fri, 17 Jan 2025 21:20:03 +0000 (UTC) Received: from fllvem-ot03.ext.ti.com (fllvem-ot03.ext.ti.com [198.47.19.245]) by mx.groups.io with SMTP id smtpd.web10.5927.1737148794598542079 for ; Fri, 17 Jan 2025 13:19:54 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=nZ+KQKUb; spf=pass (domain: ti.com, ip: 198.47.19.245, mailfrom: afd@ti.com) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllvem-ot03.ext.ti.com (8.15.2/8.15.2) with ESMTPS id 50HLJrMI252483 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 17 Jan 2025 15:19:53 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1737148793; bh=i/vAMqIj++VAahgy74KI0MDgp+iJ1rjU03vdlFJyYb4=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=nZ+KQKUb0+gO/jz1QMgIzPwDtJzsFiOnyu2yGvUo6Ft/wUAnZW1lAKfgszqatNNvo 8KPvI5XwHZJyxQMJ3vboJeSci7RMYvGuftR8CSG2dPUfXadx0Lga70RGMcp+7St4IA jRAa1xgRQvk8NsoNq7kOWUpCUZ672Pwm4UvlzR/M= Received: from DFLE106.ent.ti.com (dfle106.ent.ti.com [10.64.6.27]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTP id 50HLJrFY075175; Fri, 17 Jan 2025 15:19:53 -0600 Received: from DFLE114.ent.ti.com (10.64.6.35) by DFLE106.ent.ti.com (10.64.6.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Fri, 17 Jan 2025 15:19:53 -0600 Received: from lelvsmtp5.itg.ti.com (10.180.75.250) by DFLE114.ent.ti.com (10.64.6.35) 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; Fri, 17 Jan 2025 15:19:53 -0600 Received: from fllvsmtp7.itg.ti.com ([10.249.42.149]) by lelvsmtp5.itg.ti.com (8.15.2/8.15.2) with ESMTP id 50HLJp5i030757; Fri, 17 Jan 2025 15:19:52 -0600 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , CC: Andrew Davis Subject: [meta-arago][scarthgap/master][PATCH 5/5] ffmpeg: Remove bbappend to disable x264 Date: Fri, 17 Jan 2025 15:19:51 -0600 Message-ID: <20250117211951.698377-5-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250117211951.698377-1-afd@ti.com> References: <20250117211951.698377-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 ; Fri, 17 Jan 2025 21:20:03 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15711 The x264 codec is no longer enabled by default in oe-core, remove the extra disabling. The x264 codec is not the only codec that makes this package license flag commercial, so removing that flag after only disabling one codec is not correct. All potentially troublesome codecs should be evaluated before setting LICENSE_FLAGS_ACCEPTED to approve of the license flags. Signed-off-by: Andrew Davis --- meta-arago-distro/conf/distro/arago.conf | 9 ++++----- .../recipes-multimedia/ffmpeg/ffmpeg_%.bbappend | 4 ---- 2 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 meta-arago-distro/recipes-multimedia/ffmpeg/ffmpeg_%.bbappend diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf index baa526a9..85c7ddd1 100644 --- a/meta-arago-distro/conf/distro/arago.conf +++ b/meta-arago-distro/conf/distro/arago.conf @@ -164,11 +164,10 @@ require conf/distro/include/branding-${ARAGO_BRAND}.inc # Disable meta-virtualization sanity check and warning SKIP_META_VIRT_SANITY_CHECK = "1" -# oe-core uses external libav instead of internal libav for gst-ffmpeg. We -# disable by default the codecs in libav that causes issues with shipping an -# Arago based SDK. No need to prevent gst-ffmpeg from being used since we -# disable troublesome software. -LICENSE_FLAGS_ACCEPTED = "commercial_gst-ffmpeg commercial_gstreamer1.0-libav commercial_faad2 non-commercial_netperf" +# Codecs in libav and ffmpeg with questionable patent statuses are not +# included by default. If you enable any of those codecs you should check +# if the below acceptance flags still work for your software distribution +LICENSE_FLAGS_ACCEPTED = "commercial_ffmpeg commercial_gstreamer1.0-libav" # Do not package own copy of perl into devkit, rely on host one ASSUME_PROVIDED += "nativesdk-perl" diff --git a/meta-arago-distro/recipes-multimedia/ffmpeg/ffmpeg_%.bbappend b/meta-arago-distro/recipes-multimedia/ffmpeg/ffmpeg_%.bbappend deleted file mode 100644 index d2f22d8e..00000000 --- a/meta-arago-distro/recipes-multimedia/ffmpeg/ffmpeg_%.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -PR:append = ".arago0" - -PACKAGECONFIG:remove = "x264" -LICENSE_FLAGS = ""