summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2011-06-20 13:14:21 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-23 12:07:36 +0100
commitd1557562a52b5728b0803b8b8bac2bfe91f012a3 (patch)
tree0eaa8856384fcb3bcfaad703e729b7386fa67545 /scripts
parent35e622d41590f1005c799ff8216967383f6cdfff (diff)
downloadpoky-d1557562a52b5728b0803b8b8bac2bfe91f012a3.tar.gz
python: Switch to using the default -dbg package
Python was missing a lot of debug information. Switch to use the default -dbg package. Also add some additional debug information to the -dbg package. (From OE-Core rev: 63f4e1b469046753009d0cef498ef09c87c54912) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/contrib/python/generate-manifest-2.6.py16
1 files changed, 9 insertions, 7 deletions
diff --git a/scripts/contrib/python/generate-manifest-2.6.py b/scripts/contrib/python/generate-manifest-2.6.py
index 1b11266edf..0cc06b053e 100755
--- a/scripts/contrib/python/generate-manifest-2.6.py
+++ b/scripts/contrib/python/generate-manifest-2.6.py
@@ -4,6 +4,11 @@
4# (C) 2002-2010 Michael 'Mickey' Lauer <mlauer@vanille-media.de> 4# (C) 2002-2010 Michael 'Mickey' Lauer <mlauer@vanille-media.de>
5# (C) 2007 Jeremy Laine 5# (C) 2007 Jeremy Laine
6# licensed under MIT, see COPYING.MIT 6# licensed under MIT, see COPYING.MIT
7#
8# June 22, 2011 -- Mark Hatle <mark.hatle@windriver.com>
9# * Updated to no longer generate special -dbg package, instead use the
10# single system -dbg
11# * Update version with ".1" to indicate this change
7 12
8import os 13import os
9import sys 14import sys
@@ -12,7 +17,7 @@ import time
12VERSION = "2.6.6" 17VERSION = "2.6.6"
13 18
14__author__ = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" 19__author__ = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
15__version__ = "20110222" 20__version__ = "20110222.1"
16 21
17class MakefileMaker: 22class MakefileMaker:
18 23
@@ -76,9 +81,9 @@ class MakefileMaker:
76 # generate package line 81 # generate package line
77 # 82 #
78 83
79 packageLine = 'PACKAGES="${PN}-core-dbg ' 84 packageLine = 'PACKAGES="${PN}-dbg '
80 for name in sorted(self.packages): 85 for name in sorted(self.packages):
81 if name != '${PN}-core-dbg': 86 if name != '${PN}-dbg':
82 packageLine += "%s " % name 87 packageLine += "%s " % name
83 packageLine += '${PN}-modules"' 88 packageLine += '${PN}-modules"'
84 89
@@ -123,7 +128,7 @@ class MakefileMaker:
123 line = 'RDEPENDS_${PN}-modules="' 128 line = 'RDEPENDS_${PN}-modules="'
124 129
125 for name, data in sorted(self.packages.iteritems()): 130 for name, data in sorted(self.packages.iteritems()):
126 if name not in ['${PN}-core-dbg', '${PN}-dev']: 131 if name not in ['${PN}-dev']:
127 line += "%s " % name 132 line += "%s " % name
128 133
129 self.out( "%s \"" % line ) 134 self.out( "%s \"" % line )
@@ -161,9 +166,6 @@ if __name__ == "__main__":
161 "lib-dynload/binascii.so lib-dynload/_struct.so lib-dynload/time.so " + 166 "lib-dynload/binascii.so lib-dynload/_struct.so lib-dynload/time.so " +
162 "lib-dynload/xreadlines.so types.* platform.* ${bindir}/python*" ) 167 "lib-dynload/xreadlines.so types.* platform.* ${bindir}/python*" )
163 168
164 m.addPackage( "${PN}-core-dbg", "Python core module debug information", "${PN}-core",
165 "config/.debug lib-dynload/.debug ${bindir}/.debug ${libdir}/.debug" )
166
167 m.addPackage( "${PN}-dev", "Python Development Package", "${PN}-core", 169 m.addPackage( "${PN}-dev", "Python Development Package", "${PN}-core",
168 "${includedir} ${libdir}/libpython2.6.so" ) # package 170 "${includedir} ${libdir}/libpython2.6.so" ) # package
169 171