Skip to contentSkip to conversation

arago.conf: Remove old and unused config flags

PATCH In review Andrew Davis 2 participants 8 messages Jan 21, 2025 – Jan 22, 2025

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/7 arago.conf: Remove old and unused config flags

These are no longer used in any layer, remove these.

---

Changes for v2:
- No changes

 meta-arago-distro/conf/distro/arago.conf | 11 -----------
 1 file changed, 11 deletions(-)
meta-arago-distro/conf/distro/arago.conf +0 -11
index 8e094e02..6e8c6cb9 100644
@@ -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
Signature · 1 line
2.39.2
#1 lore raw

PATCH v2 2/7 arago.conf: Remove leftover comments around security protections

These flags, along with many more updated ones, can all be set using security_flags.inc from oe-core now.

---

Changes for v2:
- No changes

 meta-arago-distro/conf/distro/arago.conf | 4 ----
 1 file changed, 4 deletions(-)
meta-arago-distro/conf/distro/arago.conf +0 -4
index 6e8c6cb9..f1948523 100644
@@ -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
 
Signature · 1 line
2.39.2
#2 lore raw

PATCH v2 3/7 arago-prefs.inc: Remove PREFERRED_PROVIDER for jpeg

In reply to Andrew Davis

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.

---

Changes for v2:
- No changes

 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(-)
meta-arago-distro/conf/distro/include/arago-prefs.inc +0 -2
index a518a857..f8e39830 100644
@@ -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"
meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-standalone-sdk-target.bb +1 -1
index 9c5a2644..78ffe567 100644
@@ -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 \
Signature · 1 line
2.39.2
#3 lore raw

PATCH v2 4/7 opencv: Remove OpenCV customization and DISTRO_FEATURE

In reply to Andrew Davis

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.

---

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
meta-arago-demos/recipes-apps/point-cloud-viewer/point-cloud-viewer_git.bb +2 -5
index 0388a2e0..9211c653 100644
@@ -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}
meta-arago-distro/conf/distro/arago.conf +2 -3
index f1948523..baa526a9 100644
@@ -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"
meta-arago-distro/recipes-support/opencv/opencv/am57xx-evm/setupEnv.sh deleted +0 -3
deleted file mode 100644
index 3ad25601..00000000
@@ -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'
meta-arago-distro/recipes-support/opencv/opencv/dra7xx-evm/setupEnv.sh deleted +0 -3
deleted file mode 100644
index 3ad25601..00000000
@@ -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'
meta-arago-distro/recipes-support/opencv/opencv/keystone/setupEnv.sh deleted +0 -3
deleted file mode 100644
index 5b6bdb78..00000000
@@ -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'
meta-arago-distro/recipes-support/opencv/opencv/setupEnv.sh deleted +0 -2
deleted file mode 100644
index 5bf7afd3..00000000
@@ -1,2 +0,0 @@
-export OPENCV_BUILDDIR=/usr/share/OpenCV/samples
-export OPENCV_TEST_DATA_PATH=/usr/share/OpenCV/testdata
meta-arago-distro/recipes-support/opencv/opencv_%.bbappend deleted +0 -3
deleted file mode 100644
index 2ee6bff7..00000000
@@ -1,3 +0,0 @@
-inherit features_check
-
-REQUIRED_DISTRO_FEATURES = "opencv"
Signature · 1 line
2.39.2
#4 lore raw

PATCH v2 5/7 arago.conf: Remove OpenMP as a DISTRO_FEATURE

In reply to Andrew Davis

The "openmp" DISTRO_FEATURE is now unused after DSP accelerated OpenCL and OpenMP recipes were dropped. Remove this as a DISTRO_FEATURE.

---

Changes for v2:
- New patch

 meta-arago-distro/conf/distro/arago.conf | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
meta-arago-distro/conf/distro/arago.conf +2 -3
index baa526a9..9f51ac26 100644
@@ -50,12 +50,11 @@ DISTRO_FEATURES:append = " pam wayland opengl"
 DISTRO_FEATURES:remove = "x11"
 #DISTRO_FEATURES:append = " opencl"
 DISTRO_FEATURES:append = " vulkan"
-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 openmp"
-DISTRO_FEATURES_FILTER_NATIVESDK:append = " opencl openmp"
+DISTRO_FEATURES_FILTER_NATIVE:append = " opencl"
+DISTRO_FEATURES_FILTER_NATIVESDK:append = " opencl"
 
 # Set global runtime providers for major components
 ARAGO_SYSVINIT ??= "0"
Signature · 1 line
2.39.2
#5 lore raw

PATCH v2 6/7 arago.conf: Remove unneeded LICENSE_FLAGS_ACCEPTED items

In reply to Andrew Davis

netperf is no longer marked as non-commercial (587fe5877 in meta-oe).

faad2 is still marked commercial and AAC is still covered under several patents that may require royalties. Not sure why we decided to whitelist this, the commit adding it has no message. So, what can be added without explanation can be removed without explanation :)

gst-ffmpeg is no longer a package, remove this too.

---

Changes for v2:
- Explain each change better in commit message

 meta-arago-distro/conf/distro/arago.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-arago-distro/conf/distro/arago.conf +1 -1
index 9f51ac26..033b8fcd 100644
@@ -167,7 +167,7 @@ SKIP_META_VIRT_SANITY_CHECK = "1"
 # 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"
+LICENSE_FLAGS_ACCEPTED = "commercial_gstreamer1.0-libav"
 
 # Do not package own copy of perl into devkit, rely on host one
 ASSUME_PROVIDED += "nativesdk-perl"
Signature · 1 line
2.39.2
#6 lore raw

Re: [meta-arago][scarthgap/master][PATCH v2 6/7] arago.conf: Remove unneeded LICENSE_FLAGS_ACCEPTED items

Quoted 6 lines · Andrew Davis via lists.yoctoproject.org

netperf is no longer marked as non-commercial (587fe5877 in meta-oe).

faad2 is still marked commercial and AAC is still covered under several patents that may require royalties. Not sure why we decided to whitelist this, the commit adding it has no message. So, what can be added without explanation can be removed without explanation :)

Heh... IIRC, there was an unconditional build dependency back then, probably a mistake. If removing it doesn't break anything, then it should be removed.

Quoted 26 lines

gst-ffmpeg is no longer a package, remove this too.

---

Changes for v2:
- Explain each change better in commit message

 meta-arago-distro/conf/distro/arago.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-arago-distro/conf/distro/arago.conf +1 -1
index 9f51ac26..033b8fcd 100644
@@ -167,7 +167,7 @@ SKIP_META_VIRT_SANITY_CHECK = "1"
 # 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"
+LICENSE_FLAGS_ACCEPTED = "commercial_gstreamer1.0-libav"
 
 # Do not package own copy of perl into devkit, rely on host one
 ASSUME_PROVIDED += "nativesdk-perl"
Signature · 1 line
2.39.2
#7 lore raw

PATCH v2 7/7 ffmpeg: Remove bbappend to disable x264

In reply to Andrew Davis

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.

---

Changes for v2:
- Move some LICENSE_FLAGS_ACCEPTED items to previous patch

 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
meta-arago-distro/conf/distro/arago.conf +4 -5
index 033b8fcd..f27a6128 100644
@@ -163,11 +163,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_gstreamer1.0-libav"
+# 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"
meta-arago-distro/recipes-multimedia/ffmpeg/ffmpeg_%.bbappend deleted +0 -4
deleted file mode 100644
index d2f22d8e..00000000
@@ -1,4 +0,0 @@
-PR:append = ".arago0"
-
-PACKAGECONFIG:remove = "x264"
-LICENSE_FLAGS = ""
Signature · 1 line
2.39.2