From 706975657227fd8270e8411f1455714a970d5d62 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 15 Jul 2022 18:00:37 +0100 Subject: [PATCH] curl: Fix determinism issues in ptest package 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 [YOCTO #14863] (From OE-Core rev: 0b1e3746478e9ad1800b027ab5dc96495997807e) Signed-off-by: Richard Purdie --- meta/recipes-support/curl/curl_7.84.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/curl/curl_7.84.0.bb b/meta/recipes-support/curl/curl_7.84.0.bb index 28b09ef017..75417cd1bc 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}