diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-04-06 10:44:20 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-04-07 11:43:36 +0100 |
| commit | 720249de1ebb08499b7a9ac0d1ece955cf87f8b2 (patch) | |
| tree | 4ce135409e2386da98b39f78b6be6d2954cb5956 | |
| parent | 79703d83790a2973fefdb0e12e125b5f17e98cdf (diff) | |
| download | openembedded-core-720249de1ebb08499b7a9ac0d1ece955cf87f8b2.tar.gz openembedded-core-720249de1ebb08499b7a9ac0d1ece955cf87f8b2.tar.bz2 openembedded-core-720249de1ebb08499b7a9ac0d1ece955cf87f8b2.zip | |
Revert "python3: fix create_manifest to handle pycache folders"
Alejandro asked this be reverted as the patch causes more problems
than it solves.
This reverts commit 5d288d286e0adb221649d896c132a607ecddc490.
| -rw-r--r-- | meta/recipes-devtools/python/python3/create_manifest3.py | 5 | ||||
| -rw-r--r-- | meta/recipes-devtools/python/python3/python3-manifest.json | 20 |
2 files changed, 10 insertions, 15 deletions
diff --git a/meta/recipes-devtools/python/python3/create_manifest3.py b/meta/recipes-devtools/python/python3/create_manifest3.py index 44f3454582..2f944f9b13 100644 --- a/meta/recipes-devtools/python/python3/create_manifest3.py +++ b/meta/recipes-devtools/python/python3/create_manifest3.py @@ -189,10 +189,7 @@ for key in old_manifest: # Ignore folders, since we don't import those, difficult to handle multilib if isFolder(value): # Pass folders directly - if isCached(value): - new_manifest[key]['cached'].append(value) - else: - new_manifest[key]['files'].append(value) + new_manifest[key]['files'].append(value) # Ignore binaries, since we don't import those if '${bindir}' in value: # Pass it directly to the new manifest data structure diff --git a/meta/recipes-devtools/python/python3/python3-manifest.json b/meta/recipes-devtools/python/python3/python3-manifest.json index 26fa613eff..2491f36db2 100644 --- a/meta/recipes-devtools/python/python3/python3-manifest.json +++ b/meta/recipes-devtools/python/python3/python3-manifest.json @@ -736,21 +736,21 @@ "${libdir}/python3.5/__pycache__/poplib.*.pyc", "${libdir}/python3.5/__pycache__/smtplib.*.pyc", "${libdir}/python3.5/__pycache__/telnetlib.*.pyc", - "${libdir}/python3.5/__pycache__/uuid.*.pyc", - "${libdir}/python3.5/http/__pycache__", - "${libdir}/python3.5/urllib/__pycache__" + "${libdir}/python3.5/__pycache__/uuid.*.pyc" ], "files": [ "${libdir}/python3.5/base64.py", "${libdir}/python3.5/ftplib.py", "${libdir}/python3.5/hmac.py", "${libdir}/python3.5/http", + "${libdir}/python3.5/http/__pycache__", "${libdir}/python3.5/mimetypes.py", "${libdir}/python3.5/nntplib.py", "${libdir}/python3.5/poplib.py", "${libdir}/python3.5/smtplib.py", "${libdir}/python3.5/telnetlib.py", "${libdir}/python3.5/urllib", + "${libdir}/python3.5/urllib/__pycache__", "${libdir}/python3.5/uuid.py" ], "rdepends": [ @@ -1091,12 +1091,11 @@ "summary": "Python typing support" }, "unittest": { - "cached": [ - "${libdir}/python3.5/unittest/__pycache__" - ], + "cached": [], "files": [ "${libdir}/python3.5/unittest", - "${libdir}/python3.5/unittest/" + "${libdir}/python3.5/unittest/", + "${libdir}/python3.5/unittest/__pycache__" ], "rdepends": [ "core", @@ -1136,11 +1135,10 @@ "summary": "Python basic XML support" }, "xmlrpc": { - "cached": [ - "${libdir}/python3.5/xmlrpc/__pycache__" - ], + "cached": [], "files": [ - "${libdir}/python3.5/xmlrpc" + "${libdir}/python3.5/xmlrpc", + "${libdir}/python3.5/xmlrpc/__pycache__" ], "rdepends": [ "core", |