[OE-core] [oe-commits] Matthew McClintock : distutils.bblass: change order of args to install step

Martin Jansa martin.jansa at gmail.com
Thu Aug 23 14:09:52 UTC 2012 

On Wed, Aug 22, 2012 at 01:24:34PM +0000, git at git.openembedded.org wrote:
> Module: openembedded-core.git
> Branch: master
> Commit: 3b23feca31480cc56f55301fd0274e622c40b522
> URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=3b23feca31480cc56f55301fd0274e622c40b522
> 
> Author: Matthew McClintock <msm at freescale.com>
> Date:   Tue Aug 21 13:44:21 2012 -0500
> 
> distutils.bblass: change order of args to install step
> 
> This let's the user override install-lib argument again if it needs
> to be something else, otherwise things like python-setuptools
> won't be able to modify the install-lib dir
> 
> This fixes a new issue exposed by my previous distutils patch
> that fixed the python modules default install location. Also,
> it removes running the install step twice which was inadvertant
> 
> Signed-off-by: Matthew McClintock <msm at freescale.com>
> Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
> 
> ---
> 
>  meta/classes/distutils.bbclass |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass
> index 7588b81..52a1aa8 100644
> --- a/meta/classes/distutils.bbclass
> +++ b/meta/classes/distutils.bbclass
> @@ -38,8 +38,7 @@ distutils_do_install() {
>          STAGING_LIBDIR=${STAGING_LIBDIR} \
>          PYTHONPATH=${D}/${PYTHON_SITEPACKAGES_DIR} \
>          BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
> -        ${STAGING_BINDIR_NATIVE}/python-native/python setup.py install ${DISTUTILS_INSTALL_ARGS} || \
> -        ${STAGING_BINDIR_NATIVE}/python-native/python setup.py install ${DISTUTILS_INSTALL_ARGS} --install-lib=${D}${libdir}/${PYTHON_DIR} || \
> +        ${STAGING_BINDIR_NATIVE}/python-native/python setup.py install --install-lib=${D}${libdir}/${PYTHON_DIR} ${DISTUTILS_INSTALL_ARGS} || \
>          bbfatal "python setup.py install execution failed."
>  
>          for i in `find ${D} -name "*.py"` ; do \

This seems to break recipes which inherit distutils only, now libs are installed in
/usr/lib/python2.7 directly instead of /usr/lib/python2.7/site-packages and packaging fails with fatal QA
NOTE: Executing RunQueue Tasks
ERROR: QA Issue: non debug package contains .debug directory: python-pyrtc path /work/armv7a-vfp-neon-oe-linux-gnueabi/python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/packages-split/python-pyrtc/usr/lib/python2.7/.debug/pyrtc.so
ERROR: QA run found fatal errors. Please consider fixing them.

OE @ ~/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi $ find python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2.old/packages-split/
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2.old/packages-split/
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2.old/packages-split/python-pyrtc.shlibdeps
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2.old/packages-split/python-pyrtc
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2.old/packages-split/python-pyrtc/usr
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2.old/packages-split/python-pyrtc/usr/lib
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2.old/packages-split/python-pyrtc/usr/lib/python2.7
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2.old/packages-split/python-pyrtc/usr/lib/python2.7/.debug
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2.old/packages-split/python-pyrtc/usr/lib/python2.7/.debug/pyrtc.so
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2.old/packages-split/python-pyrtc/usr/lib/python2.7/PyRTC-1.0.0-py2.7.egg-info
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2.old/packages-split/python-pyrtc/usr/lib/python2.7/site-packages
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2.old/packages-split/python-pyrtc/usr/lib/python2.7/pyrtc.so
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2.old/packages-split/python-pyrtc-doc
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2.old/packages-split/python-pyrtc-dbg
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2.old/packages-split/python-pyrtc-dbg/usr
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2.old/packages-split/python-pyrtc-dbg/usr/src
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2.old/packages-split/python-pyrtc-dbg/usr/src/debug
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2.old/packages-split/python-pyrtc-dbg/usr/src/debug/python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2.old/packages-split/python-pyrtc-dbg/usr/src/debug/python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/git
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2.old/packages-split/python-pyrtc-dbg/usr/src/debug/python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/git/pyrtc
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2.old/packages-split/python-pyrtc-dbg/usr/src/debug/python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/git/pyrtc/pyrtc.c
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2.old/packages-split/python-pyrtc-dbg/usr/src/debug/python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/git/pyrtc/rtc.c
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2.old/packages-split/python-pyrtc-dev
OE @ ~/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi $ find python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/packages-split/
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/packages-split/
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/packages-split/python-pyrtc.shlibdeps
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/packages-split/python-pyrtc
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/packages-split/python-pyrtc/usr
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/packages-split/python-pyrtc/usr/lib
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/packages-split/python-pyrtc/usr/lib/python2.7
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/packages-split/python-pyrtc/usr/lib/python2.7/site-packages
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/packages-split/python-pyrtc/usr/lib/python2.7/site-packages/PyRTC-1.0.0-py2.7.egg-info
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/packages-split/python-pyrtc/usr/lib/python2.7/site-packages/pyrtc.so
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/packages-split/python-pyrtc-doc
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/packages-split/python-pyrtc-dbg
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/packages-split/python-pyrtc-dbg/usr
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/packages-split/python-pyrtc-dbg/usr/src
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/packages-split/python-pyrtc-dbg/usr/src/debug
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/packages-split/python-pyrtc-dbg/usr/src/debug/python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/packages-split/python-pyrtc-dbg/usr/src/debug/python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/git
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/packages-split/python-pyrtc-dbg/usr/src/debug/python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/git/pyrtc
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/packages-split/python-pyrtc-dbg/usr/src/debug/python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/git/pyrtc/pyrtc.c
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/packages-split/python-pyrtc-dbg/usr/src/debug/python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/git/pyrtc/rtc.c
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/packages-split/python-pyrtc-dbg/usr/lib
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/packages-split/python-pyrtc-dbg/usr/lib/python2.7
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/packages-split/python-pyrtc-dbg/usr/lib/python2.7/site-packages
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/packages-split/python-pyrtc-dbg/usr/lib/python2.7/site-packages/.debug
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/packages-split/python-pyrtc-dbg/usr/lib/python2.7/site-packages/.debug/pyrtc.so
python-pyrtc-1_1.0.0+gitr1+63b1dff1bc8ac22efabcee8a90e957c3b2423317-ml2/packages-split/python-pyrtc-dev

Cheers,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20120823/d6bb6bd6/attachment-0002.sig>

More information about the Openembedded-core mailing list