diff options
| author | Luciano Dittgen <luciano.dittgen@ossystems.com.br> | 2026-08-21 17:30:27 -0300 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2026-08-24 18:39:34 +0000 |
| commit | 18e9baf40462b7e12ac377a46fac97eb6521183f (patch) | |
| tree | 1206ff3f6e255473d7a77dbc263ef9fe22c1ee91 /dynamic-layers | |
| parent | 310051f9db75e214398c2ff50f6177dd2e56f523 (diff) | |
| download | meta-freescale-18e9baf40462b7e12ac377a46fac97eb6521183f.tar.gz | |
opencv: Reformat multiline values, drop multilineident overrides
oelint.vars.multilineident flagged EXTRA_OECMAKE, PACKAGECONFIG,
PACKAGECONFIG:append:class-target and PACKAGES because the first value
started on the opening-quote line, which does not align with the
continuation column.
Per review, reformat all four: put an empty opening quote and move every
item onto an aligned continuation line, so the first item is no longer
special-cased. This satisfies the rule without a nooelint directive. All
four values are whitespace-split, so the cmake args, PACKAGECONFIG
entries and the package list are unchanged.
The top section is a verbatim meta-openembedded copy (see the file
header); this reformat makes the four assignments diverge from upstream
whitespace, which the maintainer requested to avoid the lint override.
A before/after buildhistory comparison for imx8mm-lpddr4-evk shows no
change to any binary package, file list or dependency; only opencv-src
PKGSIZE shifts by the whitespace delta recorded in the debug sources.
Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br>
(cherry picked from commit 96a58b1e31394a9f0dc3bd453536fd6e7d02cbfc)
Diffstat (limited to 'dynamic-layers')
| -rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_4.13.0.imx.bb | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_4.13.0.imx.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_4.13.0.imx.bb index 65b3f64b4..ffd819918 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_4.13.0.imx.bb +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_4.13.0.imx.bb | |||
| @@ -76,14 +76,15 @@ addtask unpack_extra after do_unpack before do_patch | |||
| 76 | 76 | ||
| 77 | CMAKE_VERBOSE = "VERBOSE=1" | 77 | CMAKE_VERBOSE = "VERBOSE=1" |
| 78 | 78 | ||
| 79 | EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${S}/contrib/modules \ | 79 | EXTRA_OECMAKE = " \ |
| 80 | -DWITH_1394=OFF \ | 80 | -DOPENCV_EXTRA_MODULES_PATH=${S}/contrib/modules \ |
| 81 | -DENABLE_PRECOMPILED_HEADERS=OFF \ | 81 | -DWITH_1394=OFF \ |
| 82 | -DCMAKE_SKIP_RPATH=ON \ | 82 | -DENABLE_PRECOMPILED_HEADERS=OFF \ |
| 83 | -DWITH_IPP=OFF \ | 83 | -DCMAKE_SKIP_RPATH=ON \ |
| 84 | -DOPENCV_GENERATE_PKGCONFIG=ON \ | 84 | -DWITH_IPP=OFF \ |
| 85 | -DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \ | 85 | -DOPENCV_GENERATE_PKGCONFIG=ON \ |
| 86 | -DOPENCV_ALLOW_DOWNLOADS=OFF \ | 86 | -DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \ |
| 87 | -DOPENCV_ALLOW_DOWNLOADS=OFF \ | ||
| 87 | ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DCPU_DISPATCH=SSE,SSE2,SSE3,SSSE3", "", d)} \ | 88 | ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DCPU_DISPATCH=SSE,SSE2,SSE3,SSSE3", "", d)} \ |
| 88 | ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DCPU_DISPATCH=SSE,SSE2,SSE3,SSSE3,SSE41", "", d)} \ | 89 | ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DCPU_DISPATCH=SSE,SSE2,SSE3,SSSE3,SSE41", "", d)} \ |
| 89 | ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DCPU_DISPATCH=SSE,SSE2,SSE3,SSSE3,SSE41,SSE42", "", d)} \ | 90 | ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DCPU_DISPATCH=SSE,SSE2,SSE3,SSSE3,SSE41,SSE42", "", d)} \ |
| @@ -95,9 +96,11 @@ LDFLAGS:append:riscv32 = " -Wl,--no-as-needed -latomic -Wl,--as-needed" | |||
| 95 | EXTRA_OECMAKE:append:x86 = " -DX86=ON" | 96 | EXTRA_OECMAKE:append:x86 = " -DX86=ON" |
| 96 | EXTRA_OECMAKE:append:aarch64 = " -DKLEIDICV_SOURCE_PATH=${S}/3rdparty/kleidicv" | 97 | EXTRA_OECMAKE:append:aarch64 = " -DKLEIDICV_SOURCE_PATH=${S}/3rdparty/kleidicv" |
| 97 | 98 | ||
| 98 | PACKAGECONFIG ??= "python3 eigen jpeg png tiff v4l libv4l samples tbb \ | 99 | PACKAGECONFIG ??= " \ |
| 100 | python3 eigen jpeg png tiff v4l libv4l samples tbb \ | ||
| 99 | ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" | 101 | ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" |
| 100 | PACKAGECONFIG:append:class-target = " gapi gstreamer gphoto2 \ | 102 | PACKAGECONFIG:append:class-target = " \ |
| 103 | gapi gstreamer gphoto2 \ | ||
| 101 | ${@bb.utils.contains_any("LICENSE_FLAGS_ACCEPTED", "commercial_ffmpeg commercial", "libav", "", d)}" | 104 | ${@bb.utils.contains_any("LICENSE_FLAGS_ACCEPTED", "commercial_ffmpeg commercial", "libav", "", d)}" |
| 102 | 105 | ||
| 103 | # TBB does not build for powerpc so disable that package config | 106 | # TBB does not build for powerpc so disable that package config |
| @@ -142,11 +145,12 @@ export ANT_DIR = "${STAGING_DIR_NATIVE}/usr/share/ant/" | |||
| 142 | 145 | ||
| 143 | TARGET_CC_ARCH += "-I${S}/include " | 146 | TARGET_CC_ARCH += "-I${S}/include " |
| 144 | 147 | ||
| 145 | PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'samples', '${PN}-samples', '', d)} \ | 148 | PACKAGES += " \ |
| 149 | ${@bb.utils.contains('PACKAGECONFIG', 'samples', '${PN}-samples', '', d)} \ | ||
| 146 | ${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java', '', d)} \ | 150 | ${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java', '', d)} \ |
| 147 | ${@bb.utils.contains('PACKAGECONFIG', 'java', '${PN}-java', '', d)} \ | 151 | ${@bb.utils.contains('PACKAGECONFIG', 'java', '${PN}-java', '', d)} \ |
| 148 | ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-${BPN}', '', d)} \ | 152 | ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-${BPN}', '', d)} \ |
| 149 | ${PN}-apps" | 153 | ${PN}-apps" |
| 150 | 154 | ||
| 151 | python populate_packages:prepend () { | 155 | python populate_packages:prepend () { |
| 152 | cv_libdir = d.expand('${libdir}') | 156 | cv_libdir = d.expand('${libdir}') |
