mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-15 06:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

python: Fix ptest not working problems

Browse Source 
The run-ptest contained in python uses a Makefile. The path of the
Makefile is changed to ${libdir}/python/ptest in do_install_ptest.
However, the directory is wrong when the project is configured with
"--enable-multilib=lib32"

In addition, do_install_ptest is defined before "inherit ptest", so
it is overriden by the one in ptest.bbclass. do_install_ptest is
moved down.

(From OE-Core rev: 0eb947454e1c92467283e6f1adeca67c7c57698b)

Signed-off-by: Zhangle Yang <zhangle.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Zhangle Yang
2013-11-18 20:54:55 +08:00
committed by Richard Purdie
parent f9729f473d
commit e45d7355f1
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
meta/recipes-devtools/python/python_2.7.3.bb
View File

@@ -134,11 +134,6 @@ do_install_append_class-nativesdk () {
create_wrapper ${D}${bindir}/python2.7 TERMINFO_DIRS='${sysconfdir}/terminfo:/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo' create_wrapper ${D}${bindir}/python2.7 TERMINFO_DIRS='${sysconfdir}/terminfo:/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo'
} }
do_install_ptest() {
cp ${B}/Makefile ${D}${PTEST_PATH}
sed -i s:LIBDIR:${libdir}:g ${D}${PTEST_PATH}/run-ptest
}
SSTATE_SCAN_FILES += "Makefile" SSTATE_SCAN_FILES += "Makefile"
PACKAGE_PREPROCESS_FUNCS += "py_package_preprocess" PACKAGE_PREPROCESS_FUNCS += "py_package_preprocess"
@@ -172,6 +167,14 @@ RDEPENDS_${PN}-ptest = "${PN}-modules ${PN}-misc"
#inherit ptest after "require python-${PYTHON_MAJMIN}-manifest.inc" so PACKAGES doesn't get overwritten #inherit ptest after "require python-${PYTHON_MAJMIN}-manifest.inc" so PACKAGES doesn't get overwritten
inherit ptest 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
}
# catch manpage # catch manpage
PACKAGES += "${PN}-man" PACKAGES += "${PN}-man"
FILES_${PN}-man = "${datadir}/man" FILES_${PN}-man = "${datadir}/man"