Out of tree builds appear to work fine, so use them. This means updating do_install_ptest so that it correctly uses S or B as appropriate.
Signed-off-by: Ross Burton <[email protected]> --- .../libseccomp/libseccomp_2.6.0.bb | 38 +++++++++++-------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/meta/recipes-support/libseccomp/libseccomp_2.6.0.bb b/meta/recipes-support/libseccomp/libseccomp_2.6.0.bb index 998f1b5548d..dd56391e1ff 100644 --- a/meta/recipes-support/libseccomp/libseccomp_2.6.0.bb +++ b/meta/recipes-support/libseccomp/libseccomp_2.6.0.bb @@ -14,7 +14,7 @@ SRC_URI = "git://github.com/seccomp/libseccomp.git;branch=release-2.6;protocol=h file://run-ptest \ " -inherit autotools-brokensep pkgconfig ptest features_check +inherit autotools pkgconfig ptest features_check inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} @@ -31,27 +31,35 @@ do_compile_ptest() { do_install_ptest() { install -d ${D}${PTEST_PATH}/tests - install -d ${D}${PTEST_PATH}/tools - for file in $(find tests/* -executable -type f); do - install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tests + for file in $(find ${S}/tests/* -executable -type f); do + install -m 744 $file ${D}/${PTEST_PATH}/tests done - for file in $(find tests/*.tests -type f); do - install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tests + for file in $(find ${B}/tests/* -executable -type f); do + install -m 744 $file ${D}/${PTEST_PATH}/tests done - for file in $(find tests/*.pfc -type f); do - install -m 644 ${S}/${file} ${D}/${PTEST_PATH}/tests + for file in $(find ${S}/tests/*.tests -type f); do + install -m 744 $file ${D}/${PTEST_PATH}/tests + done + for file in $(find ${S}/tests/*.pfc -type f); do + install -m 644 $file ${D}/${PTEST_PATH}/tests done install -m 644 ${S}/tests/valgrind_test.supp ${D}/${PTEST_PATH}/tests - for file in $(find tools/* -executable -type f); do - install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tools + + install -d ${D}${PTEST_PATH}/tools + for file in $(find ${S}/tools/* -executable -type f); do + install -m 744 $file ${D}/${PTEST_PATH}/tools + done + for file in $(find ${B}/tools/* -executable -type f); do + install -m 744 $file ${D}/${PTEST_PATH}/tools done # Overwrite libtool wrappers with real executables - for file in $(find tools/.libs/* -executable -type f); do - install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tools + for file in $(find ${B}/tools/.libs/* -executable -type f); do + install -m 744 $file ${D}/${PTEST_PATH}/tools done - # fix python shebang - sed -i -e 's@cmd /usr/bin/env python @cmd /usr/bin/env python3 @' ${D}/${PTEST_PATH}/tests/regression - sed -i -e 's@^#!/usr/bin/env python$@#!/usr/bin/env python3@' ${D}/${PTEST_PATH}/tests/*.py + + # fix python shebang + sed -i -e 's@cmd /usr/bin/env python @cmd /usr/bin/env python3 @' ${D}/${PTEST_PATH}/tests/regression + sed -i -e 's@^#!/usr/bin/env python$@#!/usr/bin/env python3@' ${D}/${PTEST_PATH}/tests/*.py } FILES:${PN} = "${bindir} ${libdir}/${BPN}.so* ${PYTHON_SITEPACKAGES_DIR}/" -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#228129): https://lists.openembedded.org/g/openembedded-core/message/228129 Mute This Topic: https://lists.openembedded.org/mt/116846136/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
