Instead of installing the libtool wrapper scripts and hoping that the real binaries are in .libs/, just use libtool to install the binaries directly.
This will relink if needed, and removes any assumptions about file locations. Signed-off-by: Ross Burton <[email protected]> --- .../libseccomp/libseccomp_2.6.0.bb | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/meta/recipes-support/libseccomp/libseccomp_2.6.0.bb b/meta/recipes-support/libseccomp/libseccomp_2.6.0.bb index dd56391e1ff..2c06824a799 100644 --- a/meta/recipes-support/libseccomp/libseccomp_2.6.0.bb +++ b/meta/recipes-support/libseccomp/libseccomp_2.6.0.bb @@ -32,13 +32,13 @@ do_compile_ptest() { do_install_ptest() { install -d ${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 ${B}/tests/* -executable -type f); do - install -m 744 $file ${D}/${PTEST_PATH}/tests + install $file ${D}/${PTEST_PATH}/tests done for file in $(find ${S}/tests/*.tests -type f); do - install -m 744 $file ${D}/${PTEST_PATH}/tests + install $file ${D}/${PTEST_PATH}/tests + done + for file in $(find ${B}/tests/* -executable -type f); do + ${B}/libtool --mode=install install $file ${D}/${PTEST_PATH}/tests done for file in $(find ${S}/tests/*.pfc -type f); do install -m 644 $file ${D}/${PTEST_PATH}/tests @@ -47,14 +47,10 @@ do_install_ptest() { install -d ${D}${PTEST_PATH}/tools for file in $(find ${S}/tools/* -executable -type f); do - install -m 744 $file ${D}/${PTEST_PATH}/tools + install $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 ${B}/tools/.libs/* -executable -type f); do - install -m 744 $file ${D}/${PTEST_PATH}/tools + ${B}/libtool --mode=install install $file ${D}/${PTEST_PATH}/tools done # fix python shebang -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#228130): https://lists.openembedded.org/g/openembedded-core/message/228130 Mute This Topic: https://lists.openembedded.org/mt/116846137/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
