classes: Sync various classes with OE for various bugfixes

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2407 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 5 insertions, 1 deletions

diff --git a/meta/classes/distutils-base.bbclass b/meta/classes/distutils-base.bbclass
index 15e945d518..c3f325768d 100644
--- a/meta/classes/distutils-base.bbclass
+++ b/meta/classes/distutils-base.bbclass
@@ -7,8 +7,12 @@ def python_dir(d):
         staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 )
         if os.path.exists( "%s/python2.3" % staging_incdir ): return "python2.3"
         if os.path.exists( "%s/python2.4" % staging_incdir ): return "python2.4"
+        if os.path.exists( "%s/python2.5" % staging_incdir ): return "python2.5"
         raise "No Python in STAGING_INCDIR. Forgot to build python-native ?"
 
 PYTHON_DIR = "${@python_dir(d)}"
-FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}"
+FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*"
+FILES_${PN}-dbg = "${libdir}/${PYTHON_DIR}/site-packages/.debug \
+                   ${libdir}/${PYTHON_DIR}/site-packages/./*/debug \
+                   ${libdir}/${PYTHON_DIR}/site-packages/*/*/.debug"