mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

distutils: Tidy and simplify for readability

Browse Source 
Line lengths, remove duplication, and use the PYTHON variable provided by
pythonnative.bbclass.

Coincidentally fixes a dormant defect in distutils3.bbclass in which we were
sedding for STAGING_BINDIR_NATIVE/python-python3/python3.

(From OE-Core rev: 7b8dd17c65e2d7d163f452833f21469918bf222e)

Signed-off-by: Douglas Royds <douglas.royds@taitradio.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Douglas Royds
2019-05-14 17:55:59 +12:00
committed by Richard Purdie
parent 2537269bf5
commit 3de77b33ee
2 changed files with 19 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/distutils.bbclass
+11 -15
View File
@@ -52,25 +52,20 @@ distutils_do_install() {
# support filenames with *spaces* # support filenames with *spaces*
# only modify file if it contains path and recompile it # only modify file if it contains path and recompile it
find ${D} -name "*.py" -exec grep -q ${D} {} \; -exec sed -i -e s:${D}::g {} \; -exec ${STAGING_BINDIR_NATIVE}/python-native/python -mcompileall {} \; find ${D} -name "*.py" -exec grep -q ${D} {} \; \
-exec sed -i -e s:${D}::g {} \; \
-exec ${STAGING_BINDIR_NATIVE}/python-native/python -mcompileall {} \;
if test -e ${D}${bindir} ; then for i in ${D}${bindir}/* ${D}${sbindir}/*; do
for i in ${D}${bindir}/* ; do \ if [ -f "$i" ]; then
sed -i -e s:${STAGING_BINDIR_NATIVE}/python-native/python:${USRBINPATH}/env\ ${DISTUTILS_PYTHON}:g $i sed -i -e s:${PYTHON}:${USRBINPATH}/env\ ${DISTUTILS_PYTHON}:g $i
sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
done fi
fi done
if [ -e ${D}${sbindir} ]; then
for i in ${D}${sbindir}/* ; do \
sed -i -e s:${STAGING_BINDIR_NATIVE}/python-native/python:${USRBINPATH}/env\ ${DISTUTILS_PYTHON}:g $i
sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
done
fi
rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/easy-install.pth rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/easy-install.pth
rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py* rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py*
# #
# FIXME: Bandaid against wrong datadir computation # FIXME: Bandaid against wrong datadir computation
# #
@@ -80,7 +75,8 @@ distutils_do_install() {
fi fi
# Fix backport modules # Fix backport modules
if [ -e ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/backports/__init__.py ] && [ -e ${D}${PYTHON_SITEPACKAGES_DIR}/backports/__init__.py ]; then if [ -e ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/backports/__init__.py ] &&
[ -e ${D}${PYTHON_SITEPACKAGES_DIR}/backports/__init__.py ]; then
rm ${D}${PYTHON_SITEPACKAGES_DIR}/backports/__init__.py; rm ${D}${PYTHON_SITEPACKAGES_DIR}/backports/__init__.py;
rm ${D}${PYTHON_SITEPACKAGES_DIR}/backports/__init__.pyc; rm ${D}${PYTHON_SITEPACKAGES_DIR}/backports/__init__.pyc;
fi fi
meta/classes/distutils3.bbclass
+8 -14
View File
@@ -56,24 +56,18 @@ distutils3_do_install() {
bbfatal_log "'${PYTHON_PN} setup.py install ${DISTUTILS_INSTALL_ARGS}' execution failed." bbfatal_log "'${PYTHON_PN} setup.py install ${DISTUTILS_INSTALL_ARGS}' execution failed."
# support filenames with *spaces* # support filenames with *spaces*
find ${D} -name "*.py" -exec grep -q ${D} {} \; -exec sed -i -e s:${D}::g {} \; find ${D} -name "*.py" -exec grep -q ${D} {} \; \
-exec sed -i -e s:${D}::g {} \;
if test -e ${D}${bindir} ; then for i in ${D}${bindir}/* ${D}${sbindir}/*; do
for i in ${D}${bindir}/* ; do \ if [ -f "$i" ]; then
sed -i -e s:${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN}:${USRBINPATH}/env\ ${DISTUTILS_PYTHON}:g $i sed -i -e s:${PYTHON}:${USRBINPATH}/env\ ${DISTUTILS_PYTHON}:g $i
sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
done fi
fi done
if test -e ${D}${sbindir}; then
for i in ${D}${sbindir}/* ; do \
sed -i -e s:${STAGING_BINDIR_NATIVE}/python-${PYTHON_PN}/${PYTHON_PN}:${USRBINPATH}/env\ ${DISTUTILS_PYTHON}:g $i
sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
done
fi
rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/easy-install.pth rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/easy-install.pth
# #
# FIXME: Bandaid against wrong datadir computation # FIXME: Bandaid against wrong datadir computation
# #