From 95a9f53c62fd89cf46c02682f71b1e58df894022 Mon Sep 17 00:00:00 2001 From: Jake Morrison Date: Mon, 11 Jun 2007 16:27:22 +0000 Subject: distutils-base: improve packaging of debug packages (approved by Mickeyl) - close #2443 and probably few others --- classes/distutils-base.bbclass | 1 + 1 file changed, 1 insertion(+) (limited to 'classes/distutils-base.bbclass') diff --git a/classes/distutils-base.bbclass b/classes/distutils-base.bbclass index 15e945d518..db006b8c77 100644 --- a/classes/distutils-base.bbclass +++ b/classes/distutils-base.bbclass @@ -11,4 +11,5 @@ def python_dir(d): PYTHON_DIR = "${@python_dir(d)}" FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}" +FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/${SRCNAME}/.debug" -- cgit v1.2.3 From 6dfd134e423f7a33fdf1e48069890fb8fc4a41db Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 14 Jun 2007 03:02:08 +0000 Subject: distutils-base.bbclass: * add support for python 2.5 * catch more .debug files --- classes/distutils-base.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'classes/distutils-base.bbclass') diff --git a/classes/distutils-base.bbclass b/classes/distutils-base.bbclass index db006b8c77..993ad7964e 100644 --- a/classes/distutils-base.bbclass +++ b/classes/distutils-base.bbclass @@ -7,9 +7,11 @@ 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}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/${SRCNAME}/.debug" +FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*" +FILES_${PN}-dbg = "${libdir}/${PYTHON_DIR}/site-packages/${SRCNAME}/.debug \ + ${libdir}/${PYTHON_DIR}/site-packages/.debug" -- cgit v1.2.3 From b3cf95431b7d23a2e3bec34d2203f343e08fe5e2 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 19 Jun 2007 06:18:02 +0000 Subject: distutils-base: package even more debug files --- classes/distutils-base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/distutils-base.bbclass') diff --git a/classes/distutils-base.bbclass b/classes/distutils-base.bbclass index 993ad7964e..a66d845858 100644 --- a/classes/distutils-base.bbclass +++ b/classes/distutils-base.bbclass @@ -12,6 +12,6 @@ def python_dir(d): PYTHON_DIR = "${@python_dir(d)}" FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*" -FILES_${PN}-dbg = "${libdir}/${PYTHON_DIR}/site-packages/${SRCNAME}/.debug \ +FILES_${PN}-dbg = "${libdir}/${PYTHON_DIR}/site-packages/*/.debug \ ${libdir}/${PYTHON_DIR}/site-packages/.debug" -- cgit v1.2.3 From 697093f6bc5ab5d3941cfa68fea21a2ba56def85 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 24 Jul 2007 01:04:50 +0000 Subject: distutils: set PYTHONPATH and always create the site-packages directory to improve compatibility with certain extension packages --- classes/distutils-base.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'classes/distutils-base.bbclass') diff --git a/classes/distutils-base.bbclass b/classes/distutils-base.bbclass index a66d845858..c3f325768d 100644 --- a/classes/distutils-base.bbclass +++ b/classes/distutils-base.bbclass @@ -12,6 +12,7 @@ def python_dir(d): PYTHON_DIR = "${@python_dir(d)}" FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*" -FILES_${PN}-dbg = "${libdir}/${PYTHON_DIR}/site-packages/*/.debug \ - ${libdir}/${PYTHON_DIR}/site-packages/.debug" +FILES_${PN}-dbg = "${libdir}/${PYTHON_DIR}/site-packages/.debug \ + ${libdir}/${PYTHON_DIR}/site-packages/./*/debug \ + ${libdir}/${PYTHON_DIR}/site-packages/*/*/.debug" -- cgit v1.2.3