libseccomp: allow out-of-tree builds

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 <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 998f1b5548dca466aa883b50cd0df742a0e02b93..dd56391e1ff6e7eac4275c4aee2d8c8e987e9e3e 100644 (file)
--- 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 ${B}/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 ${S}/tests/*.tests -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/*.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}/"