diff options
-rw-r--r-- | meta/recipes-devtools/python/python_2.7.3.bb | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/meta/recipes-devtools/python/python_2.7.3.bb b/meta/recipes-devtools/python/python_2.7.3.bb index 40d20f1f4f..887e02e1c3 100644 --- a/meta/recipes-devtools/python/python_2.7.3.bb +++ b/meta/recipes-devtools/python/python_2.7.3.bb | |||
@@ -134,11 +134,6 @@ do_install_append_class-nativesdk () { | |||
134 | create_wrapper ${D}${bindir}/python2.7 TERMINFO_DIRS='${sysconfdir}/terminfo:/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo' | 134 | create_wrapper ${D}${bindir}/python2.7 TERMINFO_DIRS='${sysconfdir}/terminfo:/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo' |
135 | } | 135 | } |
136 | 136 | ||
137 | do_install_ptest() { | ||
138 | cp ${B}/Makefile ${D}${PTEST_PATH} | ||
139 | sed -i s:LIBDIR:${libdir}:g ${D}${PTEST_PATH}/run-ptest | ||
140 | } | ||
141 | |||
142 | SSTATE_SCAN_FILES += "Makefile" | 137 | SSTATE_SCAN_FILES += "Makefile" |
143 | PACKAGE_PREPROCESS_FUNCS += "py_package_preprocess" | 138 | PACKAGE_PREPROCESS_FUNCS += "py_package_preprocess" |
144 | 139 | ||
@@ -172,6 +167,14 @@ RDEPENDS_${PN}-ptest = "${PN}-modules ${PN}-misc" | |||
172 | #inherit ptest after "require python-${PYTHON_MAJMIN}-manifest.inc" so PACKAGES doesn't get overwritten | 167 | #inherit ptest after "require python-${PYTHON_MAJMIN}-manifest.inc" so PACKAGES doesn't get overwritten |
173 | inherit ptest | 168 | inherit ptest |
174 | 169 | ||
170 | # This must come after inherit ptest for the override to take effect | ||
171 | do_install_ptest() { | ||
172 | cp ${B}/Makefile ${D}${PTEST_PATH} | ||
173 | sed -e s:LIBDIR/python/ptest:${PTEST_PATH}:g \ | ||
174 | -e s:LIBDIR:${libdir}:g \ | ||
175 | -i ${D}${PTEST_PATH}/run-ptest | ||
176 | } | ||
177 | |||
175 | # catch manpage | 178 | # catch manpage |
176 | PACKAGES += "${PN}-man" | 179 | PACKAGES += "${PN}-man" |
177 | FILES_${PN}-man = "${datadir}/man" | 180 | FILES_${PN}-man = "${datadir}/man" |