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 14:13:47 +0100
commit2055517d91e0c55ed108d3a6f52abd1d2c6824b2 (patch)
treeaaf55ddccbf381049a752fe436fc3034eeaffd6b
parent7d1c3470bb06e43245ccb7f067121de606506430 (diff)
downloadopenembedded-core-contrib-2055517d91e0c55ed108d3a6f52abd1d2c6824b2.tar.gz
openembedded-core-contrib-2055517d91e0c55ed108d3a6f52abd1d2c6824b2.tar.bz2
openembedded-core-contrib-2055517d91e0c55ed108d3a6f52abd1d2c6824b2.zip
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>
-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() {
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}"