summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Orling <timothy.t.orling@linux.intel.com>2017-11-18 16:10:06 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-13 14:00:51 +0000
commit8aa71adf4932b4a7e62c1d66c3de25faa3db23c2 (patch)
tree5808b74301a7ea4de136134f88ba352713676ab6
parent69a910d2e7e440760d02e22f8fce90ee87e15d1d (diff)
downloadpoky-8aa71adf4932b4a7e62c1d66c3de25faa3db23c2.tar.gz
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>
-rw-r--r--meta/recipes-devtools/python/python-2.7-manifest.inc9
-rw-r--r--meta/recipes-devtools/python/python-3.5-manifest.inc21
-rwxr-xr-xscripts/contrib/python/generate-manifest-2.7.py3
-rwxr-xr-xscripts/contrib/python/generate-manifest-3.5.py7
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+=" \
56 ${PN}-readline \ 56 ${PN}-readline \
57 ${PN}-resource \ 57 ${PN}-resource \
58 ${PN}-robotparser \ 58 ${PN}-robotparser \
59 ${PN}-runpy \
59 ${PN}-shell \ 60 ${PN}-shell \
60 ${PN}-smtpd \ 61 ${PN}-smtpd \
61 ${PN}-sqlite3 \ 62 ${PN}-sqlite3 \
@@ -127,6 +128,7 @@ PACKAGES=" \
127 ${PN}-readline \ 128 ${PN}-readline \
128 ${PN}-resource \ 129 ${PN}-resource \
129 ${PN}-robotparser \ 130 ${PN}-robotparser \
131 ${PN}-runpy \
130 ${PN}-shell \ 132 ${PN}-shell \
131 ${PN}-smtpd \ 133 ${PN}-smtpd \
132 ${PN}-sqlite3 \ 134 ${PN}-sqlite3 \
@@ -625,6 +627,12 @@ FILES_${PN}-robotparser=" \
625 ${libdir}/python2.7/robotparser.* \ 627 ${libdir}/python2.7/robotparser.* \
626" 628"
627 629
630SUMMARY_${PN}-runpy="Python script for locating/executing scripts in module namespace"
631RDEPENDS_${PN}-runpy="${PN}-core ${PN}-pkgutil"
632FILES_${PN}-runpy=" \
633 ${libdir}/python2.7/runpy.* \
634"
635
628SUMMARY_${PN}-shell="Python shell-like functionality" 636SUMMARY_${PN}-shell="Python shell-like functionality"
629RDEPENDS_${PN}-shell="${PN}-core ${PN}-re" 637RDEPENDS_${PN}-shell="${PN}-core ${PN}-re"
630FILES_${PN}-shell=" \ 638FILES_${PN}-shell=" \
@@ -809,6 +817,7 @@ RDEPENDS_${PN}-modules=" \
809 ${PN}-readline \ 817 ${PN}-readline \
810 ${PN}-resource \ 818 ${PN}-resource \
811 ${PN}-robotparser \ 819 ${PN}-robotparser \
820 ${PN}-runpy \
812 ${PN}-shell \ 821 ${PN}-shell \
813 ${PN}-smtpd \ 822 ${PN}-smtpd \
814 ${PN}-sqlite3 \ 823 ${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+="\
46 ${PN}-numbers \ 46 ${PN}-numbers \
47 ${PN}-pickle \ 47 ${PN}-pickle \
48 ${PN}-pkgutil \ 48 ${PN}-pkgutil \
49 ${PN}-plistlib \
49 ${PN}-pprint \ 50 ${PN}-pprint \
50 ${PN}-profile \ 51 ${PN}-profile \
51 ${PN}-pydoc \ 52 ${PN}-pydoc \
@@ -53,6 +54,7 @@ PROVIDES+="\
53 ${PN}-readline \ 54 ${PN}-readline \
54 ${PN}-reprlib \ 55 ${PN}-reprlib \
55 ${PN}-resource \ 56 ${PN}-resource \
57 ${PN}-runpy \
56 ${PN}-selectors \ 58 ${PN}-selectors \
57 ${PN}-shell \ 59 ${PN}-shell \
58 ${PN}-signal \ 60 ${PN}-signal \
@@ -117,6 +119,7 @@ ${PN}-distutils \
117 ${PN}-numbers \ 119 ${PN}-numbers \
118 ${PN}-pickle \ 120 ${PN}-pickle \
119 ${PN}-pkgutil \ 121 ${PN}-pkgutil \
122 ${PN}-plistlib \
120 ${PN}-pprint \ 123 ${PN}-pprint \
121 ${PN}-profile \ 124 ${PN}-profile \
122 ${PN}-pydoc \ 125 ${PN}-pydoc \
@@ -124,6 +127,7 @@ ${PN}-distutils \
124 ${PN}-readline \ 127 ${PN}-readline \
125 ${PN}-reprlib \ 128 ${PN}-reprlib \
126 ${PN}-resource \ 129 ${PN}-resource \
130 ${PN}-runpy \
127 ${PN}-selectors \ 131 ${PN}-selectors \
128 ${PN}-shell \ 132 ${PN}-shell \
129 ${PN}-signal \ 133 ${PN}-signal \
@@ -310,6 +314,7 @@ FILES_${PN}-core="\
310 ${includedir}/python${PYTHON_BINABI}/pyconfig*.h \ 314 ${includedir}/python${PYTHON_BINABI}/pyconfig*.h \
311 ${libdir}/python${PYTHON_MAJMIN}/collections \ 315 ${libdir}/python${PYTHON_MAJMIN}/collections \
312 ${libdir}/python${PYTHON_MAJMIN}/_collections_abc.* \ 316 ${libdir}/python${PYTHON_MAJMIN}/_collections_abc.* \
317 ${libdir}/python${PYTHON_MAJMIN}/_markupbase.* \
313 ${libdir}/python${PYTHON_MAJMIN}/_sitebuiltins.* \ 318 ${libdir}/python${PYTHON_MAJMIN}/_sitebuiltins.* \
314 ${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py \ 319 ${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py \
315" 320"
@@ -768,6 +773,13 @@ FILES_${PN}-pkgutil="\
768 ${libdir}/python3.5/__pycache__/pkgutil.* \ 773 ${libdir}/python3.5/__pycache__/pkgutil.* \
769" 774"
770 775
776SUMMARY_${PN}-plistlib="Generate and parse Mac OS X .plist files"
777RDEPENDS_${PN}-plistlib="${PN}-core ${PN}-datetime ${PN}-io"
778FILES_${PN}-plistlib="\
779 ${libdir}/python3.5/plistlib.* \
780 ${libdir}/python3.5/__pycache__/plistlib.* \
781"
782
771SUMMARY_${PN}-pprint="Python pretty-print support" 783SUMMARY_${PN}-pprint="Python pretty-print support"
772RDEPENDS_${PN}-pprint="${PN}-core ${PN}-io" 784RDEPENDS_${PN}-pprint="${PN}-core ${PN}-io"
773FILES_${PN}-pprint="\ 785FILES_${PN}-pprint="\
@@ -836,6 +848,13 @@ FILES_${PN}-resource="\
836 ${libdir}/python3.5/lib-dynload/__pycache__/resource.*.so \ 848 ${libdir}/python3.5/lib-dynload/__pycache__/resource.*.so \
837" 849"
838 850
851SUMMARY_${PN}-runpy="Python script for locating/executing scripts in module namespace"
852RDEPENDS_${PN}-runpy="${PN}-core ${PN}-pkgutil"
853FILES_${PN}-runpy="\
854 ${libdir}/python3.5/runpy.* \
855 ${libdir}/python3.5/__pycache__/runpy.* \
856"
857
839SUMMARY_${PN}-selectors="Python High-level I/O multiplexing" 858SUMMARY_${PN}-selectors="Python High-level I/O multiplexing"
840RDEPENDS_${PN}-selectors="${PN}-core" 859RDEPENDS_${PN}-selectors="${PN}-core"
841FILES_${PN}-selectors="\ 860FILES_${PN}-selectors="\
@@ -1077,6 +1096,7 @@ RDEPENDS_${PN}-modules=" \
1077 ${PN}-numbers \ 1096 ${PN}-numbers \
1078 ${PN}-pickle \ 1097 ${PN}-pickle \
1079 ${PN}-pkgutil \ 1098 ${PN}-pkgutil \
1099 ${PN}-plistlib \
1080 ${PN}-pprint \ 1100 ${PN}-pprint \
1081 ${PN}-profile \ 1101 ${PN}-profile \
1082 ${PN}-pydoc \ 1102 ${PN}-pydoc \
@@ -1084,6 +1104,7 @@ RDEPENDS_${PN}-modules=" \
1084 ${PN}-readline \ 1104 ${PN}-readline \
1085 ${PN}-reprlib \ 1105 ${PN}-reprlib \
1086 ${PN}-resource \ 1106 ${PN}-resource \
1107 ${PN}-runpy \
1087 ${PN}-selectors \ 1108 ${PN}-selectors \
1088 ${PN}-shell \ 1109 ${PN}-shell \
1089 ${PN}-signal \ 1110 ${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__":
368 m.addPackage( "${PN}-robotparser", "Python robots.txt parser", "${PN}-core ${PN}-netclient", 368 m.addPackage( "${PN}-robotparser", "Python robots.txt parser", "${PN}-core ${PN}-netclient",
369 "robotparser.*") 369 "robotparser.*")
370 370
371 m.addPackage( "${PN}-runpy", "Python script for locating/executing scripts in module namespace", "${PN}-core ${PN}-pkgutil",
372 "runpy.*")
373
371 m.addPackage( "${PN}-subprocess", "Python subprocess support", "${PN}-core ${PN}-io ${PN}-re ${PN}-fcntl ${PN}-pickle", 374 m.addPackage( "${PN}-subprocess", "Python subprocess support", "${PN}-core ${PN}-io ${PN}-re ${PN}-fcntl ${PN}-pickle",
372 "subprocess.*" ) 375 "subprocess.*" )
373 376
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__":
213 "${includedir}/python${PYTHON_BINABI}/pyconfig*.h " + 213 "${includedir}/python${PYTHON_BINABI}/pyconfig*.h " +
214 "${libdir}/python${PYTHON_MAJMIN}/collections " + 214 "${libdir}/python${PYTHON_MAJMIN}/collections " +
215 "${libdir}/python${PYTHON_MAJMIN}/_collections_abc.* " + 215 "${libdir}/python${PYTHON_MAJMIN}/_collections_abc.* " +
216 "${libdir}/python${PYTHON_MAJMIN}/_markupbase.* " +
216 "${libdir}/python${PYTHON_MAJMIN}/_sitebuiltins.* " + 217 "${libdir}/python${PYTHON_MAJMIN}/_sitebuiltins.* " +
217 "${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py ") 218 "${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py ")
218 219
@@ -360,6 +361,9 @@ if __name__ == "__main__":
360 m.addPackage( "${PN}-pkgutil", "Python package extension utility support", "${PN}-core", 361 m.addPackage( "${PN}-pkgutil", "Python package extension utility support", "${PN}-core",
361 "pkgutil.*") 362 "pkgutil.*")
362 363
364 m.addPackage( "${PN}-plistlib", "Generate and parse Mac OS X .plist files", "${PN}-core ${PN}-datetime ${PN}-io",
365 "plistlib.*")
366
363 m.addPackage( "${PN}-pprint", "Python pretty-print support", "${PN}-core ${PN}-io", 367 m.addPackage( "${PN}-pprint", "Python pretty-print support", "${PN}-core ${PN}-io",
364 "pprint.*" ) 368 "pprint.*" )
365 369
@@ -378,6 +382,9 @@ if __name__ == "__main__":
378 m.addPackage( "${PN}-resource", "Python resource control interface", "${PN}-core", 382 m.addPackage( "${PN}-resource", "Python resource control interface", "${PN}-core",
379 "lib-dynload/resource.*.so" ) 383 "lib-dynload/resource.*.so" )
380 384
385 m.addPackage( "${PN}-runpy", "Python script for locating/executing scripts in module namespace", "${PN}-core ${PN}-pkgutil",
386 "runpy.*" )
387
381 m.addPackage( "${PN}-selectors", "Python High-level I/O multiplexing", "${PN}-core", 388 m.addPackage( "${PN}-selectors", "Python High-level I/O multiplexing", "${PN}-core",
382 "selectors.*" ) 389 "selectors.*" )
383 390