From ff83e15289e4b47cd3926220a0039bf97ec35120 Mon Sep 17 00:00:00 2001 From: Juro Bystricky Date: Thu, 5 Oct 2017 11:22:28 -0700 Subject: 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] Signed-off-by: Juro Bystricky Signed-off-by: Ross Burton --- meta/recipes-devtools/python/python_2.7.13.bb | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/python/python_2.7.13.bb b/meta/recipes-devtools/python/python_2.7.13.bb index 4d73cd25c8..877069943e 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.*" PACKAGES += "${PN}-misc" FILES_${PN}-misc = "${libdir}/python${PYTHON_MAJMIN}" RDEPENDS_${PN}-modules += "${PN}-misc" -RDEPENDS_${PN}-ptest = "${PN}-modules" +RDEPENDS_${PN}-ptest = "${PN}-modules ${PN}-tests" #inherit ptest after "require python-${PYTHON_MAJMIN}-manifest.inc" so PACKAGES doesn't get overwritten inherit ptest @@ -164,6 +164,16 @@ do_install_ptest() { sed -e s:LIBDIR/python/ptest:${PTEST_PATH}:g \ -e s:LIBDIR:${libdir}:g \ -i ${D}${PTEST_PATH}/run-ptest + + #Remove build host references + sed -i \ + -e 's:--with-libtool-sysroot=${STAGING_DIR_TARGET}'::g \ + -e 's:--sysroot=${STAGING_DIR_TARGET}::g' \ + -e 's|${DEBUG_PREFIX_MAP}||g' \ + -e 's:${HOSTTOOLS_DIR}/::g' \ + -e 's:${RECIPE_SYSROOT}::g' \ + -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ + ${D}/${PTEST_PATH}/Makefile } # catch manpage -- cgit 1.2.3-korg