| Message ID | 20260927052306.2867689-2-khem.raj@oss.qualcomm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-oe,1/2] pocketpy: disable CMake Unity build to fix buildpaths QA warnings | expand |
diff --git a/meta-oe/recipes-support/opencv/opencv_4.14.0.bb b/meta-oe/recipes-support/opencv/opencv_4.14.0.bb index 286b490870..7cc487c0ce 100644 --- a/meta-oe/recipes-support/opencv/opencv_4.14.0.bb +++ b/meta-oe/recipes-support/opencv/opencv_4.14.0.bb @@ -214,10 +214,8 @@ do_install:append() { rm -rf ${D}${bindir}/setup_vars_opencv4.sh fi - for fn in arithm.vsx3.cpp convert.vsx3.cpp; do - if [ -f ${B}/modules/core/$fn ]; then - sed -i -e 's,${S},/usr/src/debug/${PN}/${PV},g' ${B}/modules/core/$fn - fi + find ${B}/modules -name "*.cpp" | xargs -r grep -l "${S}" | while read -r fn; do + sed -i -e 's,${S},/usr/src/debug/${PN}/${PV},g' "$fn" done if [ -d ${D}/${bindir}/shape ]; then
The recipe already rewrote the absolute ${S} path embedded in two PowerPC VSX3 dispatch stubs (arithm.vsx3.cpp, convert.vsx3.cpp) before packaging, but OpenCV's cmake ocv_add_dispatched_file() macro generates one such stub per enabled ISA in every module (avx, avx2, avx512_skx, sse4_1, sse4_2, ...). On x86-64-v3 that produced 69 more stub files under ${B}/modules/* whose #include lines still embedded the raw build-tree path, tripping the buildpaths QA check (TMPDIR and HOME) once copied verbatim into the opencv-src package. OEQA_BUILDPATHS_SKIP would only silence the HOME-directory half of the check; TMPDIR has no skip mechanism in insane.bbclass. Generalize the existing sed-based rewrite to find and fix every generated dispatch stub under ${B}/modules, instead of a hardcoded two-file list, so any ISA/module combination is covered. AI-Generated: Uses Claude Code Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta-oe/recipes-support/opencv/opencv_4.14.0.bb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)