libseccomp: use libtool to install test binaries

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 <ross.burton@arm.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-support/libseccomp/libseccomp_2.6.0.bb b/meta/recipes-support/libseccomp/libseccomp_2.6.0.bb
index dd56391e1ff6e7eac4275c4aee2d8c8e987e9e3e..2c06824a799df1d028fa2e09715393cf3e619558 100644 (file)
--- 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