diff options
4 files changed, 14 insertions, 8 deletions
diff --git a/meta/recipes-devtools/python/python-2.7-manifest.inc b/meta/recipes-devtools/python/python-2.7-manifest.inc index 7ed254bbd6..57d4834b3a 100644 --- a/meta/recipes-devtools/python/python-2.7-manifest.inc +++ b/meta/recipes-devtools/python/python-2.7-manifest.inc | |||
@@ -281,7 +281,7 @@ RDEPENDS_${PN}-zlib="${PN}-core" | |||
281 | FILES_${PN}-zlib="${libdir}/python2.7/lib-dynload/zlib.so " | 281 | FILES_${PN}-zlib="${libdir}/python2.7/lib-dynload/zlib.so " |
282 | 282 | ||
283 | SUMMARY_${PN}-modules="All Python modules" | 283 | SUMMARY_${PN}-modules="All Python modules" |
284 | RDEPENDS_${PN}-modules="${PN}-2to3 ${PN}-argparse ${PN}-audio ${PN}-bsddb ${PN}-codecs ${PN}-compile ${PN}-compiler ${PN}-compression ${PN}-contextlib ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-difflib ${PN}-distutils ${PN}-doctest ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html ${PN}-idle ${PN}-image ${PN}-importlib ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-plistlib ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-zlib " | 284 | RDEPENDS_${PN}-modules="${PN}-2to3 ${PN}-argparse ${PN}-audio ${PN}-bsddb ${PN}-codecs ${PN}-compile ${PN}-compiler ${PN}-compression ${PN}-contextlib ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-difflib ${PN}-distutils ${PN}-doctest ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html ${PN}-idle ${PN}-image ${PN}-importlib ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-plistlib ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-zlib " |
285 | ALLOW_EMPTY_${PN}-modules = "1" | 285 | ALLOW_EMPTY_${PN}-modules = "1" |
286 | 286 | ||
287 | 287 | ||
diff --git a/meta/recipes-devtools/python/python-3.5-manifest.inc b/meta/recipes-devtools/python/python-3.5-manifest.inc index 65db7e8f20..0260e87e75 100644 --- a/meta/recipes-devtools/python/python-3.5-manifest.inc +++ b/meta/recipes-devtools/python/python-3.5-manifest.inc | |||
@@ -277,7 +277,7 @@ RDEPENDS_${PN}-xmlrpc="${PN}-core ${PN}-xml ${PN}-netserver ${PN}-lang ${PN}-pyd | |||
277 | FILES_${PN}-xmlrpc="${libdir}/python3.5/xmlrpclib.* ${libdir}/python3.5/__pycache__/xmlrpclib.* ${libdir}/python3.5/SimpleXMLRPCServer.* ${libdir}/python3.5/__pycache__/SimpleXMLRPCServer.* ${libdir}/python3.5/DocXMLRPCServer.* ${libdir}/python3.5/__pycache__/DocXMLRPCServer.* ${libdir}/python3.5/xmlrpc ${libdir}/python3.5/xmlrpc/__pycache__ " | 277 | FILES_${PN}-xmlrpc="${libdir}/python3.5/xmlrpclib.* ${libdir}/python3.5/__pycache__/xmlrpclib.* ${libdir}/python3.5/SimpleXMLRPCServer.* ${libdir}/python3.5/__pycache__/SimpleXMLRPCServer.* ${libdir}/python3.5/DocXMLRPCServer.* ${libdir}/python3.5/__pycache__/DocXMLRPCServer.* ${libdir}/python3.5/xmlrpc ${libdir}/python3.5/xmlrpc/__pycache__ " |
278 | 278 | ||
279 | SUMMARY_${PN}-modules="All Python modules" | 279 | SUMMARY_${PN}-modules="All Python modules" |
280 | RDEPENDS_${PN}-modules="${PN}-2to3 ${PN}-argparse ${PN}-asyncio ${PN}-audio ${PN}-codecs ${PN}-compile ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-difflib ${PN}-distutils ${PN}-doctest ${PN}-email ${PN}-enum ${PN}-fcntl ${PN}-gdbm ${PN}-html ${PN}-idle ${PN}-image ${PN}-importlib ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-reprlib ${PN}-resource ${PN}-selectors ${PN}-shell ${PN}-signal ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-typing ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc " | 280 | RDEPENDS_${PN}-modules="${PN}-2to3 ${PN}-argparse ${PN}-asyncio ${PN}-audio ${PN}-codecs ${PN}-compile ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-difflib ${PN}-distutils ${PN}-doctest ${PN}-email ${PN}-enum ${PN}-fcntl ${PN}-gdbm ${PN}-html ${PN}-idle ${PN}-image ${PN}-importlib ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-reprlib ${PN}-resource ${PN}-selectors ${PN}-shell ${PN}-signal ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-typing ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc " |
281 | ALLOW_EMPTY_${PN}-modules = "1" | 281 | ALLOW_EMPTY_${PN}-modules = "1" |
282 | 282 | ||
283 | 283 | ||
diff --git a/scripts/contrib/python/generate-manifest-2.7.py b/scripts/contrib/python/generate-manifest-2.7.py index dce465abff..586b329c19 100755 --- a/scripts/contrib/python/generate-manifest-2.7.py +++ b/scripts/contrib/python/generate-manifest-2.7.py | |||
@@ -28,6 +28,7 @@ class MakefileMaker: | |||
28 | def __init__( self, outfile, isNative ): | 28 | def __init__( self, outfile, isNative ): |
29 | """initialize""" | 29 | """initialize""" |
30 | self.packages = {} | 30 | self.packages = {} |
31 | self.excluded_pkgs = [] | ||
31 | self.targetPrefix = "${libdir}/python%s/" % VERSION[:3] | 32 | self.targetPrefix = "${libdir}/python%s/" % VERSION[:3] |
32 | self.isNative = isNative | 33 | self.isNative = isNative |
33 | self.output = outfile | 34 | self.output = outfile |
@@ -52,7 +53,7 @@ class MakefileMaker: | |||
52 | self.out( """ """ ) | 53 | self.out( """ """ ) |
53 | self.out( "" ) | 54 | self.out( "" ) |
54 | 55 | ||
55 | def addPackage( self, name, description, dependencies, filenames ): | 56 | def addPackage( self, name, description, dependencies, filenames, mod_exclude = False ): |
56 | """add a package to the Makefile""" | 57 | """add a package to the Makefile""" |
57 | if type( filenames ) == type( "" ): | 58 | if type( filenames ) == type( "" ): |
58 | filenames = filenames.split() | 59 | filenames = filenames.split() |
@@ -62,6 +63,8 @@ class MakefileMaker: | |||
62 | fullFilenames.append( "%s%s" % ( self.targetPrefix, filename ) ) | 63 | fullFilenames.append( "%s%s" % ( self.targetPrefix, filename ) ) |
63 | else: | 64 | else: |
64 | fullFilenames.append( filename ) | 65 | fullFilenames.append( filename ) |
66 | if mod_exclude: | ||
67 | self.excluded_pkgs.append( name ) | ||
65 | self.packages[name] = description, dependencies, fullFilenames | 68 | self.packages[name] = description, dependencies, fullFilenames |
66 | 69 | ||
67 | def doBody( self ): | 70 | def doBody( self ): |
@@ -147,7 +150,7 @@ class MakefileMaker: | |||
147 | line = 'RDEPENDS_${PN}-modules="' | 150 | line = 'RDEPENDS_${PN}-modules="' |
148 | 151 | ||
149 | for name, data in sorted(self.packages.items()): | 152 | for name, data in sorted(self.packages.items()): |
150 | if name not in ['${PN}-dev', '${PN}-distutils-staticdev']: | 153 | if name not in ['${PN}-dev', '${PN}-distutils-staticdev'] and name not in self.excluded_pkgs: |
151 | line += "%s " % name | 154 | line += "%s " % name |
152 | 155 | ||
153 | self.out( "%s \"" % line ) | 156 | self.out( "%s \"" % line ) |
@@ -382,7 +385,7 @@ if __name__ == "__main__": | |||
382 | "pty.* tty.*" ) | 385 | "pty.* tty.*" ) |
383 | 386 | ||
384 | m.addPackage( "${PN}-tests", "Python tests", "${PN}-core ${PN}-modules", | 387 | m.addPackage( "${PN}-tests", "Python tests", "${PN}-core ${PN}-modules", |
385 | "test" ) # package | 388 | "test", True ) # package |
386 | 389 | ||
387 | m.addPackage( "${PN}-threading", "Python threading & synchronization support", "${PN}-core ${PN}-lang", | 390 | m.addPackage( "${PN}-threading", "Python threading & synchronization support", "${PN}-core ${PN}-lang", |
388 | "_threading_local.* dummy_thread.* dummy_threading.* mutex.* threading.* Queue.*" ) | 391 | "_threading_local.* dummy_thread.* dummy_threading.* mutex.* threading.* Queue.*" ) |
diff --git a/scripts/contrib/python/generate-manifest-3.5.py b/scripts/contrib/python/generate-manifest-3.5.py index 2975e109c9..6352f8f120 100755 --- a/scripts/contrib/python/generate-manifest-3.5.py +++ b/scripts/contrib/python/generate-manifest-3.5.py | |||
@@ -31,6 +31,7 @@ class MakefileMaker: | |||
31 | def __init__( self, outfile, isNative ): | 31 | def __init__( self, outfile, isNative ): |
32 | """initialize""" | 32 | """initialize""" |
33 | self.packages = {} | 33 | self.packages = {} |
34 | self.excluded_pkgs = [] | ||
34 | self.targetPrefix = "${libdir}/python%s/" % VERSION[:3] | 35 | self.targetPrefix = "${libdir}/python%s/" % VERSION[:3] |
35 | self.isNative = isNative | 36 | self.isNative = isNative |
36 | self.output = outfile | 37 | self.output = outfile |
@@ -55,7 +56,7 @@ class MakefileMaker: | |||
55 | self.out( """ """ ) | 56 | self.out( """ """ ) |
56 | self.out( "" ) | 57 | self.out( "" ) |
57 | 58 | ||
58 | def addPackage( self, name, description, dependencies, filenames ): | 59 | def addPackage( self, name, description, dependencies, filenames, mod_exclude = False ): |
59 | """add a package to the Makefile""" | 60 | """add a package to the Makefile""" |
60 | if type( filenames ) == type( "" ): | 61 | if type( filenames ) == type( "" ): |
61 | filenames = filenames.split() | 62 | filenames = filenames.split() |
@@ -67,6 +68,8 @@ class MakefileMaker: | |||
67 | self.pycachePath( filename ) ) ) | 68 | self.pycachePath( filename ) ) ) |
68 | else: | 69 | else: |
69 | fullFilenames.append( filename ) | 70 | fullFilenames.append( filename ) |
71 | if mod_exclude: | ||
72 | self.excluded_pkgs.append( name ) | ||
70 | self.packages[name] = description, dependencies, fullFilenames | 73 | self.packages[name] = description, dependencies, fullFilenames |
71 | 74 | ||
72 | def pycachePath( self, filename ): | 75 | def pycachePath( self, filename ): |
@@ -160,7 +163,7 @@ class MakefileMaker: | |||
160 | line = 'RDEPENDS_${PN}-modules="' | 163 | line = 'RDEPENDS_${PN}-modules="' |
161 | 164 | ||
162 | for name, data in sorted(self.packages.items()): | 165 | for name, data in sorted(self.packages.items()): |
163 | if name not in ['${PN}-dev', '${PN}-distutils-staticdev']: | 166 | if name not in ['${PN}-dev', '${PN}-distutils-staticdev'] and name not in self.excluded_pkgs: |
164 | line += "%s " % name | 167 | line += "%s " % name |
165 | 168 | ||
166 | self.out( "%s \"" % line ) | 169 | self.out( "%s \"" % line ) |
@@ -401,7 +404,7 @@ if __name__ == "__main__": | |||
401 | "pty.* tty.*" ) | 404 | "pty.* tty.*" ) |
402 | 405 | ||
403 | m.addPackage( "${PN}-tests", "Python tests", "${PN}-core ${PN}-compression", | 406 | m.addPackage( "${PN}-tests", "Python tests", "${PN}-core ${PN}-compression", |
404 | "test" ) # package | 407 | "test", True ) # package |
405 | 408 | ||
406 | m.addPackage( "${PN}-threading", "Python threading & synchronization support", "${PN}-core ${PN}-lang", | 409 | m.addPackage( "${PN}-threading", "Python threading & synchronization support", "${PN}-core ${PN}-lang", |
407 | "_threading_local.* dummy_thread.* dummy_threading.* mutex.* threading.* queue.*" ) | 410 | "_threading_local.* dummy_thread.* dummy_threading.* mutex.* threading.* queue.*" ) |