From 18e9baf40462b7e12ac377a46fac97eb6521183f Mon Sep 17 00:00:00 2001 From: Luciano Dittgen Date: Fri, 21 Aug 2026 17:30:27 -0300 Subject: 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 (cherry picked from commit 96a58b1e31394a9f0dc3bd453536fd6e7d02cbfc) --- .../recipes-support/opencv/opencv_4.13.0.imx.bb | 28 ++++++++++++---------- 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'dynamic-layers') 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 CMAKE_VERBOSE = "VERBOSE=1" -EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${S}/contrib/modules \ - -DWITH_1394=OFF \ - -DENABLE_PRECOMPILED_HEADERS=OFF \ - -DCMAKE_SKIP_RPATH=ON \ - -DWITH_IPP=OFF \ - -DOPENCV_GENERATE_PKGCONFIG=ON \ - -DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \ - -DOPENCV_ALLOW_DOWNLOADS=OFF \ +EXTRA_OECMAKE = " \ + -DOPENCV_EXTRA_MODULES_PATH=${S}/contrib/modules \ + -DWITH_1394=OFF \ + -DENABLE_PRECOMPILED_HEADERS=OFF \ + -DCMAKE_SKIP_RPATH=ON \ + -DWITH_IPP=OFF \ + -DOPENCV_GENERATE_PKGCONFIG=ON \ + -DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \ + -DOPENCV_ALLOW_DOWNLOADS=OFF \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DCPU_DISPATCH=SSE,SSE2,SSE3,SSSE3", "", d)} \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DCPU_DISPATCH=SSE,SSE2,SSE3,SSSE3,SSE41", "", d)} \ ${@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" EXTRA_OECMAKE:append:x86 = " -DX86=ON" EXTRA_OECMAKE:append:aarch64 = " -DKLEIDICV_SOURCE_PATH=${S}/3rdparty/kleidicv" -PACKAGECONFIG ??= "python3 eigen jpeg png tiff v4l libv4l samples tbb \ +PACKAGECONFIG ??= " \ + python3 eigen jpeg png tiff v4l libv4l samples tbb \ ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" -PACKAGECONFIG:append:class-target = " gapi gstreamer gphoto2 \ +PACKAGECONFIG:append:class-target = " \ + gapi gstreamer gphoto2 \ ${@bb.utils.contains_any("LICENSE_FLAGS_ACCEPTED", "commercial_ffmpeg commercial", "libav", "", d)}" # TBB does not build for powerpc so disable that package config @@ -142,11 +145,12 @@ export ANT_DIR = "${STAGING_DIR_NATIVE}/usr/share/ant/" TARGET_CC_ARCH += "-I${S}/include " -PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'samples', '${PN}-samples', '', d)} \ +PACKAGES += " \ + ${@bb.utils.contains('PACKAGECONFIG', 'samples', '${PN}-samples', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'java', '${PN}-java', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-${BPN}', '', d)} \ - ${PN}-apps" + ${PN}-apps" python populate_packages:prepend () { cv_libdir = d.expand('${libdir}') -- cgit v1.2.3-54-g00ecf