Skip to contentSkip to conversation

ptest: run-ptest not required to run do_install_ptest

PATCH New Ian Ray 1 participant 2 messages Sep 30, 2015

lore
Share & tools
lore

Ian Ray

author
#0 lore raw

v2 cover ptest: run-ptest not required to run do_install_ptest

This is a re-worked patch after some discussion in mailing list thread "ptest: user-specified run-ptest script location".

Enables "ptest-aware" packages to install the run-ptest script as part of the package install instead of bundling it in the recipe layer.

Ian Ray (1):
ptest: run-ptest not required to run do_install_ptest

 meta/classes/ptest.bbclass | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
Signature · 1 line
1.8.3.1
author
#1 lore raw

PATCH v2 1/1 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.

---
 meta/classes/ptest.bbclass | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
meta/classes/ptest.bbclass +5 -5
index b5f470f..4dc5dbe 100644
@@ -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}"
Signature · 1 line
1.8.3.1