[OE-core] [oe-commits] Morgan Little : python: Update for python-native changes

[Martin Jansa]

On Sun, Jul 22, 2012 at 10:43:53AM +0000, git at git.openembedded.org wrote:
> Module: openembedded-core.git
> Branch: master
> Commit: 284a65d55f0ffad0f4f7f32d72da0f9410578643
> URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=284a65d55f0ffad0f4f7f32d72da0f9410578643
> 
> Author: Morgan Little <morgan.little at windriver.com>
> Date:   Thu Jul 19 13:46:07 2012 -0400
> 
> python: Update for python-native changes
> 
> Add pythonnative onto the list of inherits and update the paths to the binaries
> referenced in the recipe to the new paths.
> 
> Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
> 

Any idea why is opkg package-index now failing _sometimes_ ?

| + '[' -e /var/lib/jenkins/jobs/shr-core/workspace/shr-core/tmp-eglibc/deploy/ipk/ ']'
| + touch /var/lib/jenkins/jobs/shr-core/workspace/shr-core/tmp-eglibc/deploy/ipk/Packages
| + flock /var/lib/jenkins/jobs/shr-core/workspace/shr-core/tmp-eglibc/deploy/ipk/Packages.flock -c 'opkg-make-index -r /var/lib/jenkins/jobs/shr-core/workspace/shr-core/tmp-eglibc/deploy/ipk/Packages -p /var/lib/jenkins/jobs/shr-core/workspace/shr-core/tmp-eglibc/deploy/ipk/Packages -m /var/lib/jenkins/jobs/shr-core/workspace/shr-core/tmp-eglibc/deploy/ipk/'
| Traceback (most recent call last):
|   File "/var/lib/jenkins/jobs/shr-core/workspace/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/python2.7/site.py", line 569, in <module>
|     main()
|   File "/var/lib/jenkins/jobs/shr-core/workspace/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/python2.7/site.py", line 552, in main
|     known_paths = addsitepackages(known_paths)
|   File "/var/lib/jenkins/jobs/shr-core/workspace/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/python2.7/site.py", line 329, in addsitepackages
|     for sitedir in getsitepackages():
|   File "/var/lib/jenkins/jobs/shr-core/workspace/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/python2.7/site.py", line 303, in getsitepackages
|     sitepackages.append(os.path.join(prefix, sys.lib,
| AttributeError: 'module' object has no attribute 'lib'
| ERROR: Function failed: do_package_index (see /var/lib/jenkins/jobs/shr-core/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/package-index-1.0-r0/temp/log.do_package_index.17223 for further information)
NOTE: package package-index-1.0-r0: task do_package_index: Failed

Cheers,

> ---
> 
>  meta/recipes-devtools/python/python_2.7.3.bb |   18 +++++++++---------
>  1 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/meta/recipes-devtools/python/python_2.7.3.bb b/meta/recipes-devtools/python/python_2.7.3.bb
> index b736cc2..d27ff05 100644
> --- a/meta/recipes-devtools/python/python_2.7.3.bb
> +++ b/meta/recipes-devtools/python/python_2.7.3.bb
> @@ -1,6 +1,6 @@
>  require python.inc
>  DEPENDS = "python-native bzip2 db gdbm openssl readline sqlite3 zlib"
> -PR = "${INC_PR}.0"
> +PR = "${INC_PR}.1"
>  
>  DISTRO_SRC_URI ?= "file://sitecustomize.py"
>  DISTRO_SRC_URI_linuxstdbase = ""
> @@ -30,7 +30,7 @@ SRC_URI += "\
>  
>  S = "${WORKDIR}/Python-${PV}"
>  
> -inherit autotools multilib_header
> +inherit autotools multilib_header pythonnative
>  
>  # The 3 lines below are copied from the libffi recipe, ctypes ships its own copy of the libffi sources
>  #Somehow gcc doesn't set __SOFTFP__ when passing -mfloatabi=softp :(
> @@ -45,7 +45,7 @@ do_configure_prepend() {
>  do_compile() {
>          # regenerate platform specific files, because they depend on system headers
>          cd Lib/plat-linux2
> -        include=${STAGING_INCDIR} ${STAGING_BINDIR_NATIVE}/python \
> +        include=${STAGING_INCDIR} ${STAGING_BINDIR_NATIVE}/python-native/python \
>                  ${S}/Tools/scripts/h2py.py -i '(u_long)' \
>                  ${STAGING_INCDIR}/dlfcn.h \
>                  ${STAGING_INCDIR}/linux/cdrom.h \
> @@ -89,8 +89,8 @@ do_compile() {
>  
>  	export CROSS_COMPILE="${TARGET_PREFIX}"
>  
> -	oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
> -		HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
> +	oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen \
> +		HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \
>  		STAGING_LIBDIR=${STAGING_LIBDIR} \
>  		STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \
>  		STAGING_INCDIR=${STAGING_INCDIR} \
> @@ -99,8 +99,8 @@ do_compile() {
>  
>  	oe_libinstall -so libpython${PYTHON_MAJMIN} ${STAGING_LIBDIR}
>  
> -	oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
> -		HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
> +	oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen \
> +		HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \
>  		STAGING_LIBDIR=${STAGING_LIBDIR} \
>  		STAGING_INCDIR=${STAGING_INCDIR} \
>  		STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \
> @@ -115,8 +115,8 @@ do_install() {
>  
>  	export CROSS_COMPILE="${TARGET_PREFIX}"
>  	
> -	oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
> -		HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
> +	oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen \
> +		HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \
>  		CROSSPYTHONPATH=${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-dynload/ \
>  		STAGING_LIBDIR=${STAGING_LIBDIR} \
>  		STAGING_INCDIR=${STAGING_INCDIR} \
> 
> 
> _______________________________________________
> Openembedded-commits mailing list
> Openembedded-commits at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits

-- 
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/20120723/c60238a1/attachment-0002.sig>