| Message ID | 20220715170346.680759-1-richard.purdie@linuxfoundation.org |
|---|---|
| State | New |
| Headers | show |
| Series | curl: Fix determinism issues in ptest package | expand |
diff --git a/meta/recipes-support/curl/curl_7.84.0.bb b/meta/recipes-support/curl/curl_7.84.0.bb index 28b09ef0173..75417cd1bc5 100644 --- a/meta/recipes-support/curl/curl_7.84.0.bb +++ b/meta/recipes-support/curl/curl_7.84.0.bb @@ -93,9 +93,10 @@ do_compile_ptest() { do_install_ptest() { cat ${WORKDIR}/disable-tests >> ${S}/tests/data/DISABLED - rm ${B}/tests/configurehelp.pm + rm -f ${B}/tests/configurehelp.pm cp -rf ${B}/tests ${D}${PTEST_PATH} cp -rf ${S}/tests ${D}${PTEST_PATH} + find ${D}${PTEST_PATH}/ -type f -name Makefile.am -o -name Makefile.in -o -name Makefile -delete install -d ${D}${PTEST_PATH}/src ln -sf ${bindir}/curl ${D}${PTEST_PATH}/src/curl cp -rf ${D}${bindir}/curl-config ${D}${PTEST_PATH}
NROFF can take different values depending on the filesystem layout of the host system and this leaks onto the target ptest package through the Makefiles. Since ptest doesn't use them, delete them to resovle that issue. Also ensure the task can rerun even if it already deleted configurehelp.pm Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- meta/recipes-support/curl/curl_7.84.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)