diff options
| author |   Ross Burton <ross.burton@intel.com> | 2018-10-12 12:55:02 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-13 16:03:44 +0100 |
| commit | 84f34ad223b1e3f36cab2ac12246eb90efc919bc (patch) | |
| tree | eeae2bf43227e78b92f933acc4999327779e2704 /meta/recipes-devtools/python/python_2.7.15.bb | |
| parent | 5e7a75c226d4df0c066f04eaea014b8888c6bed2 (diff) | |
| download | openembedded-core-contrib-84f34ad223b1e3f36cab2ac12246eb90efc919bc.tar.gz | |
python: clean up ptest
As the manifest handling is done differently now, just inherit ptest with the
other inherits.
test_shutil needs unzip so add to RDEPENDS.
Instead of using a patched Makefile, call test.regrtest directly.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python_2.7.15.bb')
| -rw-r--r-- | meta/recipes-devtools/python/python_2.7.15.bb | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/meta/recipes-devtools/python/python_2.7.15.bb b/meta/recipes-devtools/python/python_2.7.15.bb index 472c1da4bf..e7010bb689 100644 --- a/meta/recipes-devtools/python/python_2.7.15.bb +++ b/meta/recipes-devtools/python/python_2.7.15.bb @@ -24,7 +24,6 @@ SRC_URI += "\ file://avoid_warning_about_tkinter.patch \ file://avoid_warning_for_sunos_specific_module.patch \ file://python-2.7.3-remove-bsdb-rpath.patch \ - file://fix-makefile-for-ptest.patch \ file://run-ptest \ file://parallel-makeinst-create-bindir.patch \ file://use_sysroot_ncurses_instead_of_host.patch \ @@ -35,7 +34,7 @@ SRC_URI += "\ S = "${WORKDIR}/Python-${PV}" -inherit autotools multilib_header python-dir pythonnative +inherit autotools multilib_header python-dir pythonnative ptest CONFIGUREOPTS += " --with-system-ffi " @@ -168,27 +167,7 @@ FILES_${PN}-misc = "${libdir}/python${PYTHON_MAJMIN}" RDEPENDS_${PN}-modules += "${PN}-misc" # ptest -RDEPENDS_${PN}-ptest = "${PN}-modules ${PN}-tests" -#inherit ptest after "require python-${PYTHON_MAJMIN}-manifest.inc" so PACKAGES doesn't get overwritten -inherit ptest - -# This must come after inherit ptest for the override to take effect -do_install_ptest() { - cp ${B}/Makefile ${D}${PTEST_PATH} - 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 -} +RDEPENDS_${PN}-ptest = "${PN}-modules ${PN}-tests unzip" # catch manpage PACKAGES += "${PN}-man" |