summaryrefslogtreecommitdiff
path: root/scripts/contrib
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-02-10 14:04:04 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-11 12:27:25 +0000
commit5f7206eba3953b7f29148ecfb791995773ee5fc7 (patch)
tree98cec4af5d0a4c082f38ff37daf50a4239d8abad /scripts/contrib
parent4403b8693bd8b01e966dc5cb239a7266a9707388 (diff)
downloadopenembedded-core-5f7206eba3953b7f29148ecfb791995773ee5fc7.tar.gz
openembedded-core-5f7206eba3953b7f29148ecfb791995773ee5fc7.tar.bz2
openembedded-core-5f7206eba3953b7f29148ecfb791995773ee5fc7.zip
python: merge python-elementtree into python-xml
python-xml depends on python-elementtree as the latter just contains a C library used by the former. However there's no point to this split apart from increasing the number of packages, so merge -elementtree into python-xml. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/contrib')
-rwxr-xr-xscripts/contrib/python/generate-manifest-2.7.py8
-rwxr-xr-xscripts/contrib/python/generate-manifest-3.5.py8
2 files changed, 4 insertions, 12 deletions
diff --git a/scripts/contrib/python/generate-manifest-2.7.py b/scripts/contrib/python/generate-manifest-2.7.py
index cd8a80bfaf..14162c6f60 100755
--- a/scripts/contrib/python/generate-manifest-2.7.py
+++ b/scripts/contrib/python/generate-manifest-2.7.py
@@ -250,10 +250,6 @@ if __name__ == "__main__":
m.addPackage( "${PN}-doctest", "Python framework for running examples in docstrings", "${PN}-core ${PN}-lang ${PN}-io ${PN}-re ${PN}-unittest ${PN}-debugger ${PN}-difflib",
"doctest.*" )
- # FIXME consider adding to some higher level package
- m.addPackage( "${PN}-elementtree", "Python elementree", "${PN}-core",
- "lib-dynload/_elementtree.so" )
-
m.addPackage( "${PN}-email", "Python email support", "${PN}-core ${PN}-io ${PN}-re ${PN}-mime ${PN}-audio ${PN}-image ${PN}-netclient",
"imaplib.* email" ) # package
@@ -379,8 +375,8 @@ if __name__ == "__main__":
m.addPackage( "${PN}-unixadmin", "Python Unix administration support", "${PN}-core",
"lib-dynload/nis.so lib-dynload/grp.so lib-dynload/pwd.so getpass.*" )
- m.addPackage( "${PN}-xml", "Python basic XML support", "${PN}-core ${PN}-elementtree ${PN}-re",
- "lib-dynload/pyexpat.so xml xmllib.*" ) # package
+ m.addPackage( "${PN}-xml", "Python basic XML support", "${PN}-core ${PN}-re",
+ "lib-dynload/_elementtree.so lib-dynload/pyexpat.so xml xmllib.*" ) # package
m.addPackage( "${PN}-xmlrpc", "Python XML-RPC support", "${PN}-core ${PN}-xml ${PN}-netserver ${PN}-lang",
"xmlrpclib.* SimpleXMLRPCServer.* DocXMLRPCServer.*" )
diff --git a/scripts/contrib/python/generate-manifest-3.5.py b/scripts/contrib/python/generate-manifest-3.5.py
index c30a96360e..20ceabc698 100755
--- a/scripts/contrib/python/generate-manifest-3.5.py
+++ b/scripts/contrib/python/generate-manifest-3.5.py
@@ -253,10 +253,6 @@ if __name__ == "__main__":
m.addPackage( "${PN}-doctest", "Python framework for running examples in docstrings", "${PN}-core ${PN}-lang ${PN}-io ${PN}-re ${PN}-unittest ${PN}-debugger ${PN}-difflib",
"doctest.*" )
- # FIXME consider adding to some higher level package
- m.addPackage( "${PN}-elementtree", "Python elementree", "${PN}-core",
- "lib-dynload/_elementtree.*.so" )
-
m.addPackage( "${PN}-email", "Python email support", "${PN}-core ${PN}-io ${PN}-re ${PN}-mime ${PN}-audio ${PN}-image ${PN}-netclient",
"imaplib.* email" ) # package
@@ -376,8 +372,8 @@ if __name__ == "__main__":
m.addPackage( "${PN}-unixadmin", "Python Unix administration support", "${PN}-core",
"lib-dynload/nis.*.so lib-dynload/grp.*.so lib-dynload/pwd.*.so getpass.*" )
- m.addPackage( "${PN}-xml", "Python basic XML support", "${PN}-core ${PN}-elementtree ${PN}-re",
- "lib-dynload/pyexpat.*.so xml xmllib.*" ) # package
+ m.addPackage( "${PN}-xml", "Python basic XML support", "${PN}-core ${PN}-re",
+ "lib-dynload/_elementtree.*.so lib-dynload/pyexpat.*.so xml xmllib.*" ) # package
m.addPackage( "${PN}-xmlrpc", "Python XML-RPC support", "${PN}-core ${PN}-xml ${PN}-netserver ${PN}-lang",
"xmlrpclib.* SimpleXMLRPCServer.* DocXMLRPCServer.* xmlrpc" )