mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-07-17 04:07:06 +00:00
Code Issues Projects Releases Wiki Activity

Revert "python3: fix create_manifest to handle pycache folders"

Browse Source 
Alejandro asked this be reverted as the patch causes more problems
than it solves.

This reverts commit 5d288d286e.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2018-04-06 10:44:20 +01:00
parent d5664c3ad4
commit 7b0074b79b
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/python/python3/create_manifest3.py
+1 -4
View File
@@ -189,10 +189,7 @@ for key in old_manifest:
# Ignore folders, since we don't import those, difficult to handle multilib # Ignore folders, since we don't import those, difficult to handle multilib
if isFolder(value): if isFolder(value):
# Pass folders directly # Pass folders directly
if isCached(value): new_manifest[key]['files'].append(value)
new_manifest[key]['cached'].append(value)
else:
new_manifest[key]['files'].append(value)
# Ignore binaries, since we don't import those # Ignore binaries, since we don't import those
if '${bindir}' in value: if '${bindir}' in value:
# Pass it directly to the new manifest data structure # Pass it directly to the new manifest data structure
meta/recipes-devtools/python/python3/python3-manifest.json
+9 -11
View File
@@ -736,21 +736,21 @@
"${libdir}/python3.5/__pycache__/poplib.*.pyc", "${libdir}/python3.5/__pycache__/poplib.*.pyc",
"${libdir}/python3.5/__pycache__/smtplib.*.pyc", "${libdir}/python3.5/__pycache__/smtplib.*.pyc",
"${libdir}/python3.5/__pycache__/telnetlib.*.pyc", "${libdir}/python3.5/__pycache__/telnetlib.*.pyc",
"${libdir}/python3.5/__pycache__/uuid.*.pyc", "${libdir}/python3.5/__pycache__/uuid.*.pyc"
"${libdir}/python3.5/http/__pycache__",
"${libdir}/python3.5/urllib/__pycache__"
], ],
"files": [ "files": [
"${libdir}/python3.5/base64.py", "${libdir}/python3.5/base64.py",
"${libdir}/python3.5/ftplib.py", "${libdir}/python3.5/ftplib.py",
"${libdir}/python3.5/hmac.py", "${libdir}/python3.5/hmac.py",
"${libdir}/python3.5/http", "${libdir}/python3.5/http",
"${libdir}/python3.5/http/__pycache__",
"${libdir}/python3.5/mimetypes.py", "${libdir}/python3.5/mimetypes.py",
"${libdir}/python3.5/nntplib.py", "${libdir}/python3.5/nntplib.py",
"${libdir}/python3.5/poplib.py", "${libdir}/python3.5/poplib.py",
"${libdir}/python3.5/smtplib.py", "${libdir}/python3.5/smtplib.py",
"${libdir}/python3.5/telnetlib.py", "${libdir}/python3.5/telnetlib.py",
"${libdir}/python3.5/urllib", "${libdir}/python3.5/urllib",
"${libdir}/python3.5/urllib/__pycache__",
"${libdir}/python3.5/uuid.py" "${libdir}/python3.5/uuid.py"
], ],
"rdepends": [ "rdepends": [
@@ -1091,12 +1091,11 @@
"summary": "Python typing support" "summary": "Python typing support"
}, },
"unittest": { "unittest": {
"cached": [ "cached": [],
"${libdir}/python3.5/unittest/__pycache__"
],
"files": [ "files": [
"${libdir}/python3.5/unittest", "${libdir}/python3.5/unittest",
"${libdir}/python3.5/unittest/" "${libdir}/python3.5/unittest/",
"${libdir}/python3.5/unittest/__pycache__"
], ],
"rdepends": [ "rdepends": [
"core", "core",
@@ -1136,11 +1135,10 @@
"summary": "Python basic XML support" "summary": "Python basic XML support"
}, },
"xmlrpc": { "xmlrpc": {
"cached": [ "cached": [],
"${libdir}/python3.5/xmlrpc/__pycache__"
],
"files": [ "files": [
"${libdir}/python3.5/xmlrpc" "${libdir}/python3.5/xmlrpc",
"${libdir}/python3.5/xmlrpc/__pycache__"
], ],
"rdepends": [ "rdepends": [
"core", "core",