arago.conf: Remove old and unused config flags
PATCH 1/5 arago.conf: Remove old and unused config flags
These are no longer used in any layer, remove these.
--- meta-arago-distro/conf/distro/arago.conf | 11 ----------- 1 file changed, 11 deletions(-)
meta-arago-distro/conf/distro/arago.conf +0 -11
@@ -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
PATCH 2/5 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.
--- meta-arago-distro/conf/distro/arago.conf | 4 ---- 1 file changed, 4 deletions(-)
meta-arago-distro/conf/distro/arago.conf +0 -4
@@ -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
PATCH 3/5 arago-prefs.inc: Remove PREFERRED_PROVIDER for jpeg
In reply to Andrew DavisThere is now only one provider for libjpeg, the other provider was dropped from oe-core ~10 years ago. Remove this very outdated PREFERRED_PROVIDER.
--- 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
@@ -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
@@ -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
PATCH 4/5 opencv: Remove OpenCV customization and DISTRO_FEATURE
In reply to Andrew DavisThese 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.
--- .../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
meta-arago-demos/recipes-apps/point-cloud-viewer/point-cloud-viewer_git.bb +0 -4
@@ -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"
meta-arago-distro/conf/distro/arago.conf +2 -3
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,3 +0,0 @@ -inherit features_check - -REQUIRED_DISTRO_FEATURES = "opencv"
Signature · 1 line
2.39.2
Re: [meta-arago][scarthgap/master][PATCH 4/5] opencv: Remove OpenCV customization and DISTRO_FEATURE
Quoted 4 lines · Andrew Davis via lists.yoctoproject.org
These customizations are leftover from when we had DSP acceleration for OpenCV.
Also "opencv" is not a
DISTRO_FEATURE
Do you mean it is not a DISTRO_FEATURE already defined in OE-Core? True.
Do you mean it cannot be used as a DISTRO_FEATURE? False.
Either way, in this context "opencv" *is* a DISTRO_FEATURE and is being used as such.
Any Distro is free to define its own set of additional DISTRO_FEATURES to be used locally or downstream, which was the case here.
Moreover, please note that "openmp" is another example of a locally-defined DISTRO_FEATURE here.
In other words - I'm fine with the changes, but not fine with the reasoning behind them...
Quoted 100 lines
, 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_%.bbappendmeta-arago-demos/recipes-apps/point-cloud-viewer/point-cloud-viewer_git.bb +0
-4@@ -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"meta-arago-distro/conf/distro/arago.conf +2
-3@@ -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@@ -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@@ -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@@ -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@@ -1,2 +0,0 @@ -export OPENCV_BUILDDIR=/usr/share/OpenCV/samples -export OPENCV_TEST_DATA_PATH=/usr/share/OpenCV/testdatameta-arago-distro/recipes-support/opencv/opencv_%.bbappend deleted +0
-3@@ -1,3 +0,0 @@ -inherit features_check - -REQUIRED_DISTRO_FEATURES = "opencv"Signature · 1 line
2.39.2
Re: [meta-arago][scarthgap/master][PATCH 4/5] opencv: Remove OpenCV customization and DISTRO_FEATURE
Quoted 8 lines · Denys Dmytriyenko
Quoted 4 lines · Andrew Davis via lists.yoctoproject.org
These customizations are leftover from when we had DSP acceleration for OpenCV.
Also "opencv" is not a
DISTRO_FEATUREDo you mean it is not a
DISTRO_FEATUREalready defined in OE-Core? True.
Quoted 8 lines
Do you mean it cannot be used as a
DISTRO_FEATURE? False.Either way, in this context "opencv" *is* a
DISTRO_FEATUREand is being used as such.Any Distro is free to define its own set of additional
DISTRO_FEATURESto be used locally or downstream, which was the case here.
I was meaning the first, trying to point out it is not used by oe-core or anywhere else, and after this change is not used by Arago either. I'll re-word that to be more clear here.
Quoted 3 lines
Moreover, please note that "openmp" is another example of a locally-defined
DISTRO_FEATUREhere.
Ah that reminds me, this DISTRO_FEATURE is also now not used after dropping the openmpacc recipes, we should be able to drop it too.
Andrew
Quoted 104 lines
In other words - I'm fine with the changes, but not fine with the reasoning behind them...
Quoted 100 lines
, 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.shdelete mode 100644meta-arago-distro/recipes-support/opencv/opencv/dra7xx-evm/setupEnv.shdelete mode 100644meta-arago-distro/recipes-support/opencv/opencv/keystone/setupEnv.shdelete mode 100644meta-arago-distro/recipes-support/opencv/opencv/setupEnv.shdelete mode 100644 meta-arago-distro/recipes-support/opencv/opencv_%.bbappendmeta-arago-demos/recipes-apps/point-cloud-viewer/point-cloud-viewer_git.bb +0
-4@@ -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"meta-arago-distro/conf/distro/arago.conf +2
-3@@ -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@@ -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@@ -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@@ -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@@ -1,2 +0,0 @@ -export OPENCV_BUILDDIR=/usr/share/OpenCV/samples -export OPENCV_TEST_DATA_PATH=/usr/share/OpenCV/testdatameta-arago-distro/recipes-support/opencv/opencv_%.bbappend deleted +0
-3@@ -1,3 +0,0 @@ -inherit features_check - -REQUIRED_DISTRO_FEATURES = "opencv"Signature · 1 line
2.39.2
PATCH 5/5 ffmpeg: Remove bbappend to disable x264
In reply to Andrew DavisThe 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.
--- 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
@@ -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"
meta-arago-distro/recipes-multimedia/ffmpeg/ffmpeg_%.bbappend deleted +0 -4
@@ -1,4 +0,0 @@ -PR:append = ".arago0" - -PACKAGECONFIG:remove = "x264" -LICENSE_FLAGS = ""
Signature · 1 line
2.39.2
Re: [meta-arago][scarthgap/master][PATCH 5/5] ffmpeg: Remove bbappend to disable x264
Quoted 6 lines · Andrew Davis via lists.yoctoproject.org
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_ACCEPTEDto approve of the license flags.
From what I see in the changes below, they are not limited to x264 codec, yet, there's no explanation for other changes in the description.
Quoted 39 lines
Signed-off-by Andrew Davis <[email protected]>--- 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_%.bbappendmeta-arago-distro/conf/distro/arago.conf +4
-5@@ -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"meta-arago-distro/recipes-multimedia/ffmpeg/ffmpeg_%.bbappend deleted +0
-4@@ -1,4 +0,0 @@ -PR:append = ".arago0" - -PACKAGECONFIG:remove = "x264" -LICENSE_FLAGS = ""Signature · 1 line
2.39.2
Re: [meta-arago][scarthgap/master][PATCH 5/5] ffmpeg: Remove bbappend to disable x264
Quoted 11 lines · Denys Dmytriyenko
Quoted 6 lines · Andrew Davis via lists.yoctoproject.org
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_ACCEPTEDto approve of the license flags.From what I see in the changes below, they are not limited to x264 codec,
yet, there's no explanation for other changes in the description.
I'll split out the other changes to LICENSE_FLAGS_ACCEPTED into a different patch.
Andrew
Quoted 40 lines
Quoted 40 lines
Signed-off-by Andrew Davis <[email protected]>--- 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@@ -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"meta-arago-distro/recipes-multimedia/ffmpeg/ffmpeg_%.bbappend deleted +0
-4@@ -1,4 +0,0 @@ -PR:append = ".arago0" - -PACKAGECONFIG:remove = "x264" -LICENSE_FLAGS = ""Signature · 1 line
2.39.2