summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJuro Bystricky <juro.bystricky@intel.com>2017-10-05 18:22:28 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-10-07 22:20:40 (GMT)
commit299a44f227b03ae2fd158a9b7fd050382b255bb3 (patch)
tree25be4ba1933bd4131501a2125085b716e8b2f024 /meta
parent9f20263b5080172729d80b5355891ad2a44b80f4 (diff)
downloadpoky-299a44f227b03ae2fd158a9b7fd050382b255bb3.tar.gz
python-ptest: various fixes
python-ptest needs python-tests package installed in order to run any tests. This patch adds python-tests as a runtime dependency, so the test suite will be present in the image. While in there, also removed several build host references. [YOCTO #12144] (From OE-Core rev: ff83e15289e4b47cd3926220a0039bf97ec35120) Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/python/python_2.7.13.bb12
1 files changed, 11 insertions, 1 deletions
diff --git a/meta/recipes-devtools/python/python_2.7.13.bb b/meta/recipes-devtools/python/python_2.7.13.bb
index 4d73cd2..8770699 100644
--- a/meta/recipes-devtools/python/python_2.7.13.bb
+++ b/meta/recipes-devtools/python/python_2.7.13.bb
@@ -154,7 +154,7 @@ FILES_lib${BPN}2 = "${libdir}/libpython*.so.*"
154PACKAGES += "${PN}-misc" 154PACKAGES += "${PN}-misc"
155FILES_${PN}-misc = "${libdir}/python${PYTHON_MAJMIN}" 155FILES_${PN}-misc = "${libdir}/python${PYTHON_MAJMIN}"
156RDEPENDS_${PN}-modules += "${PN}-misc" 156RDEPENDS_${PN}-modules += "${PN}-misc"
157RDEPENDS_${PN}-ptest = "${PN}-modules" 157RDEPENDS_${PN}-ptest = "${PN}-modules ${PN}-tests"
158#inherit ptest after "require python-${PYTHON_MAJMIN}-manifest.inc" so PACKAGES doesn't get overwritten 158#inherit ptest after "require python-${PYTHON_MAJMIN}-manifest.inc" so PACKAGES doesn't get overwritten
159inherit ptest 159inherit ptest
160 160
@@ -164,6 +164,16 @@ do_install_ptest() {
164 sed -e s:LIBDIR/python/ptest:${PTEST_PATH}:g \ 164 sed -e s:LIBDIR/python/ptest:${PTEST_PATH}:g \
165 -e s:LIBDIR:${libdir}:g \ 165 -e s:LIBDIR:${libdir}:g \
166 -i ${D}${PTEST_PATH}/run-ptest 166 -i ${D}${PTEST_PATH}/run-ptest
167
168 #Remove build host references
169 sed -i \
170 -e 's:--with-libtool-sysroot=${STAGING_DIR_TARGET}'::g \
171 -e 's:--sysroot=${STAGING_DIR_TARGET}::g' \
172 -e 's|${DEBUG_PREFIX_MAP}||g' \
173 -e 's:${HOSTTOOLS_DIR}/::g' \
174 -e 's:${RECIPE_SYSROOT}::g' \
175 -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \
176 ${D}/${PTEST_PATH}/Makefile
167} 177}
168 178
169# catch manpage 179# catch manpage