python-*-manifest/generators: add runpy; python3-plistlib

* runpy allows running modules/scripts with 'python -m foo'
* python3-setuptools RDEPENDS on plistlib (present in python2)
* pip3 RDEPENDS on _markupbase (add to python3-core)

(From OE-Core rev: d95f1005c35bd9c7e22c40c7c17d264fe9435c6b)

Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

4 files changed, 40 insertions, 0 deletions

diff --git a/meta/recipes-devtools/python/python-2.7-manifest.inc b/meta/recipes-devtools/python/python-2.7-manifest.inc
index 6198e2d1c3..7c3fc1b73a 100644
--- a/meta/recipes-devtools/python/python-2.7-manifest.inc
+++ b/meta/recipes-devtools/python/python-2.7-manifest.inc
@@ -56,6 +56,7 @@ PROVIDES+=" \
   ${PN}-readline \
   ${PN}-resource \
   ${PN}-robotparser \
+  ${PN}-runpy \
   ${PN}-shell \
   ${PN}-smtpd \
   ${PN}-sqlite3 \
@@ -127,6 +128,7 @@ PACKAGES=" \
   ${PN}-readline \
   ${PN}-resource \
   ${PN}-robotparser \
+  ${PN}-runpy \
   ${PN}-shell \
   ${PN}-smtpd \
   ${PN}-sqlite3 \
@@ -625,6 +627,12 @@ FILES_${PN}-robotparser=" \
     ${libdir}/python2.7/robotparser.* \
 "
 
+SUMMARY_${PN}-runpy="Python script for locating/executing scripts in module namespace"
+RDEPENDS_${PN}-runpy="${PN}-core ${PN}-pkgutil"
+FILES_${PN}-runpy=" \
+    ${libdir}/python2.7/runpy.* \
+"
+
 SUMMARY_${PN}-shell="Python shell-like functionality"
 RDEPENDS_${PN}-shell="${PN}-core ${PN}-re"
 FILES_${PN}-shell=" \
@@ -809,6 +817,7 @@ RDEPENDS_${PN}-modules=" \
   ${PN}-readline \
   ${PN}-resource \
   ${PN}-robotparser \
+  ${PN}-runpy \
   ${PN}-shell \
   ${PN}-smtpd \
   ${PN}-sqlite3 \
diff --git a/meta/recipes-devtools/python/python-3.5-manifest.inc b/meta/recipes-devtools/python/python-3.5-manifest.inc
index 686b5f9842..1fce070290 100644
--- a/meta/recipes-devtools/python/python-3.5-manifest.inc
+++ b/meta/recipes-devtools/python/python-3.5-manifest.inc
@@ -46,6 +46,7 @@ PROVIDES+="\
   ${PN}-numbers \
   ${PN}-pickle \
   ${PN}-pkgutil \
+  ${PN}-plistlib \
   ${PN}-pprint \
   ${PN}-profile \
   ${PN}-pydoc \
@@ -53,6 +54,7 @@ PROVIDES+="\
   ${PN}-readline \
   ${PN}-reprlib \
   ${PN}-resource \
+  ${PN}-runpy \
   ${PN}-selectors \
   ${PN}-shell \
   ${PN}-signal \
@@ -117,6 +119,7 @@ ${PN}-distutils \
   ${PN}-numbers \
   ${PN}-pickle \
   ${PN}-pkgutil \
+  ${PN}-plistlib \
   ${PN}-pprint \
   ${PN}-profile \
   ${PN}-pydoc \
@@ -124,6 +127,7 @@ ${PN}-distutils \
   ${PN}-readline \
   ${PN}-reprlib \
   ${PN}-resource \
+  ${PN}-runpy \
   ${PN}-selectors \
   ${PN}-shell \
   ${PN}-signal \
@@ -310,6 +314,7 @@ FILES_${PN}-core="\
   ${includedir}/python${PYTHON_BINABI}/pyconfig*.h \
   ${libdir}/python${PYTHON_MAJMIN}/collections \
   ${libdir}/python${PYTHON_MAJMIN}/_collections_abc.* \
+  ${libdir}/python${PYTHON_MAJMIN}/_markupbase.* \
   ${libdir}/python${PYTHON_MAJMIN}/_sitebuiltins.* \
   ${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py \
 "
@@ -768,6 +773,13 @@ FILES_${PN}-pkgutil="\
   ${libdir}/python3.5/__pycache__/pkgutil.* \
 "
 
+SUMMARY_${PN}-plistlib="Generate and parse Mac OS X .plist files"
+RDEPENDS_${PN}-plistlib="${PN}-core ${PN}-datetime ${PN}-io"
+FILES_${PN}-plistlib="\
+  ${libdir}/python3.5/plistlib.* \
+  ${libdir}/python3.5/__pycache__/plistlib.* \
+"
+
 SUMMARY_${PN}-pprint="Python pretty-print support"
 RDEPENDS_${PN}-pprint="${PN}-core ${PN}-io"
 FILES_${PN}-pprint="\
@@ -836,6 +848,13 @@ FILES_${PN}-resource="\
   ${libdir}/python3.5/lib-dynload/__pycache__/resource.*.so \
 "
 
+SUMMARY_${PN}-runpy="Python script for locating/executing scripts in module namespace"
+RDEPENDS_${PN}-runpy="${PN}-core ${PN}-pkgutil"
+FILES_${PN}-runpy="\
+  ${libdir}/python3.5/runpy.* \
+  ${libdir}/python3.5/__pycache__/runpy.* \
+"
+
 SUMMARY_${PN}-selectors="Python High-level I/O multiplexing"
 RDEPENDS_${PN}-selectors="${PN}-core"
 FILES_${PN}-selectors="\
@@ -1077,6 +1096,7 @@ RDEPENDS_${PN}-modules=" \
   ${PN}-numbers \
   ${PN}-pickle \
   ${PN}-pkgutil \
+  ${PN}-plistlib \
   ${PN}-pprint \
   ${PN}-profile \
   ${PN}-pydoc \
@@ -1084,6 +1104,7 @@ RDEPENDS_${PN}-modules=" \
   ${PN}-readline \
   ${PN}-reprlib \
   ${PN}-resource \
+  ${PN}-runpy \
   ${PN}-selectors \
   ${PN}-shell \
   ${PN}-signal \
diff --git a/scripts/contrib/python/generate-manifest-2.7.py b/scripts/contrib/python/generate-manifest-2.7.py
index 2491bd0bc4..ee7540399f 100755
--- a/scripts/contrib/python/generate-manifest-2.7.py
+++ b/scripts/contrib/python/generate-manifest-2.7.py
@@ -368,6 +368,9 @@ if __name__ == "__main__":
     m.addPackage( "${PN}-robotparser", "Python robots.txt parser", "${PN}-core ${PN}-netclient",
     "robotparser.*")
 
+    m.addPackage( "${PN}-runpy", "Python script for locating/executing scripts in module namespace", "${PN}-core ${PN}-pkgutil",
+    "runpy.*")
+
     m.addPackage( "${PN}-subprocess", "Python subprocess support", "${PN}-core ${PN}-io ${PN}-re ${PN}-fcntl ${PN}-pickle",
     "subprocess.*" )
 
diff --git a/scripts/contrib/python/generate-manifest-3.5.py b/scripts/contrib/python/generate-manifest-3.5.py
index 33779cffab..7dfae46992 100755
--- a/scripts/contrib/python/generate-manifest-3.5.py
+++ b/scripts/contrib/python/generate-manifest-3.5.py
@@ -213,6 +213,7 @@ if __name__ == "__main__":
     "${includedir}/python${PYTHON_BINABI}/pyconfig*.h " +
     "${libdir}/python${PYTHON_MAJMIN}/collections " +
     "${libdir}/python${PYTHON_MAJMIN}/_collections_abc.* " +
+    "${libdir}/python${PYTHON_MAJMIN}/_markupbase.* " +
     "${libdir}/python${PYTHON_MAJMIN}/_sitebuiltins.* " +
     "${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py ")
 
@@ -360,6 +361,9 @@ if __name__ == "__main__":
     m.addPackage( "${PN}-pkgutil", "Python package extension utility support", "${PN}-core",
     "pkgutil.*")
 
+    m.addPackage( "${PN}-plistlib", "Generate and parse Mac OS X .plist files", "${PN}-core ${PN}-datetime ${PN}-io",
+    "plistlib.*")
+
     m.addPackage( "${PN}-pprint", "Python pretty-print support", "${PN}-core ${PN}-io",
     "pprint.*" )
 
@@ -378,6 +382,9 @@ if __name__ == "__main__":
     m.addPackage( "${PN}-resource", "Python resource control interface", "${PN}-core",
     "lib-dynload/resource.*.so" )
 
+    m.addPackage( "${PN}-runpy", "Python script for locating/executing scripts in module namespace", "${PN}-core ${PN}-pkgutil",
+    "runpy.*" )
+
     m.addPackage( "${PN}-selectors", "Python High-level I/O multiplexing", "${PN}-core",
     "selectors.*" )