summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Ray <ian.ray@ge.com>2015-09-30 13:03:38 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-01 15:07:48 +0100
commite4a496102d22c2d3f2f181463bde16aac5f9b9a3 (patch)
tree6c0d04f9500e85979f9ae82c912f1f5dde079f4b
parent12cd705b28412c1342c1c022340c13b1ef2c8a71 (diff)
downloadpoky-e4a496102d22c2d3f2f181463bde16aac5f9b9a3.tar.gz
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. (From OE-Core rev: 2055517d91e0c55ed108d3a6f52abd1d2c6824b2) Signed-off-by: Ian Ray <ian.ray@ge.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/ptest.bbclass10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/ptest.bbclass b/meta/classes/ptest.bbclass
index b5f470f081..4dc5dbe9ef 100644
--- a/meta/classes/ptest.bbclass
+++ b/meta/classes/ptest.bbclass
@@ -39,12 +39,12 @@ do_install_ptest() {
39do_install_ptest_base() { 39do_install_ptest_base() {
40 if [ -f ${WORKDIR}/run-ptest ]; then 40 if [ -f ${WORKDIR}/run-ptest ]; then
41 install -D ${WORKDIR}/run-ptest ${D}${PTEST_PATH}/run-ptest 41 install -D ${WORKDIR}/run-ptest ${D}${PTEST_PATH}/run-ptest
42 if grep -q install-ptest: Makefile; then
43 oe_runmake DESTDIR=${D}${PTEST_PATH} install-ptest
44 fi
45 do_install_ptest
46 chown -R root:root ${D}${PTEST_PATH}
47 fi 42 fi
43 if grep -q install-ptest: Makefile; then
44 oe_runmake DESTDIR=${D}${PTEST_PATH} install-ptest
45 fi
46 do_install_ptest
47 chown -R root:root ${D}${PTEST_PATH}
48} 48}
49 49
50do_configure_ptest_base[dirs] = "${B}" 50do_configure_ptest_base[dirs] = "${B}"