ptest: run-ptest not required to run do_install_ptest

Modify do_install_ptest_base to run do_install_ptest and install the
Makefile irrespective of the presence of ${WORKDIR}/run-ptest.  This
change allows "ptest-aware" packages to install run-ptest as part of
the make machinery.

Signed-off-by: Ian Ray <ian.ray@ge.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/ptest.bbclass b/meta/classes/ptest.bbclass
index b5f470f081c67095800268ef1b899ca52e19b584..4dc5dbe9ef2b1dd36c556bb9a7d5818a07a52e36 100644 (file)
--- a/meta/classes/ptest.bbclass
+++ b/meta/classes/ptest.bbclass
@@ -39,12 +39,12 @@ do_install_ptest() {
 do_install_ptest_base() {
     if [ -f ${WORKDIR}/run-ptest ]; then
         install -D ${WORKDIR}/run-ptest ${D}${PTEST_PATH}/run-ptest
-        if grep -q install-ptest: Makefile; then
-            oe_runmake DESTDIR=${D}${PTEST_PATH} install-ptest
-        fi
-        do_install_ptest
-        chown -R root:root ${D}${PTEST_PATH}
     fi
+    if grep -q install-ptest: Makefile; then
+        oe_runmake DESTDIR=${D}${PTEST_PATH} install-ptest
+    fi
+    do_install_ptest
+    chown -R root:root ${D}${PTEST_PATH}
 }
 
 do_configure_ptest_base[dirs] = "${B}"