summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-04-06 10:44:20 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-04-07 11:44:50 +0100
commit7b0074b79b75fad0cd511fded50aafc60c2dfec5 (patch)
tree42787ec2a04520530260409e09b19242b75f3e2d /meta
parentd5664c3ad4e038c548dda196e03490d1afdda2f2 (diff)
downloadpoky-7b0074b79b75fad0cd511fded50aafc60c2dfec5.tar.gz
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/python/python3/create_manifest3.py5
-rw-r--r--meta/recipes-devtools/python/python3/python3-manifest.json20
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:
189 # Ignore folders, since we don't import those, difficult to handle multilib 189 # Ignore folders, since we don't import those, difficult to handle multilib
190 if isFolder(value): 190 if isFolder(value):
191 # Pass folders directly 191 # Pass folders directly
192 if isCached(value): 192 new_manifest[key]['files'].append(value)
193 new_manifest[key]['cached'].append(value)
194 else:
195 new_manifest[key]['files'].append(value)
196 # Ignore binaries, since we don't import those 193 # Ignore binaries, since we don't import those
197 if '${bindir}' in value: 194 if '${bindir}' in value:
198 # Pass it directly to the new manifest data structure 195 # 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 @@
736 "${libdir}/python3.5/__pycache__/poplib.*.pyc", 736 "${libdir}/python3.5/__pycache__/poplib.*.pyc",
737 "${libdir}/python3.5/__pycache__/smtplib.*.pyc", 737 "${libdir}/python3.5/__pycache__/smtplib.*.pyc",
738 "${libdir}/python3.5/__pycache__/telnetlib.*.pyc", 738 "${libdir}/python3.5/__pycache__/telnetlib.*.pyc",
739 "${libdir}/python3.5/__pycache__/uuid.*.pyc", 739 "${libdir}/python3.5/__pycache__/uuid.*.pyc"
740 "${libdir}/python3.5/http/__pycache__",
741 "${libdir}/python3.5/urllib/__pycache__"
742 ], 740 ],
743 "files": [ 741 "files": [
744 "${libdir}/python3.5/base64.py", 742 "${libdir}/python3.5/base64.py",
745 "${libdir}/python3.5/ftplib.py", 743 "${libdir}/python3.5/ftplib.py",
746 "${libdir}/python3.5/hmac.py", 744 "${libdir}/python3.5/hmac.py",
747 "${libdir}/python3.5/http", 745 "${libdir}/python3.5/http",
746 "${libdir}/python3.5/http/__pycache__",
748 "${libdir}/python3.5/mimetypes.py", 747 "${libdir}/python3.5/mimetypes.py",
749 "${libdir}/python3.5/nntplib.py", 748 "${libdir}/python3.5/nntplib.py",
750 "${libdir}/python3.5/poplib.py", 749 "${libdir}/python3.5/poplib.py",
751 "${libdir}/python3.5/smtplib.py", 750 "${libdir}/python3.5/smtplib.py",
752 "${libdir}/python3.5/telnetlib.py", 751 "${libdir}/python3.5/telnetlib.py",
753 "${libdir}/python3.5/urllib", 752 "${libdir}/python3.5/urllib",
753 "${libdir}/python3.5/urllib/__pycache__",
754 "${libdir}/python3.5/uuid.py" 754 "${libdir}/python3.5/uuid.py"
755 ], 755 ],
756 "rdepends": [ 756 "rdepends": [
@@ -1091,12 +1091,11 @@
1091 "summary": "Python typing support" 1091 "summary": "Python typing support"
1092 }, 1092 },
1093 "unittest": { 1093 "unittest": {
1094 "cached": [ 1094 "cached": [],
1095 "${libdir}/python3.5/unittest/__pycache__"
1096 ],
1097 "files": [ 1095 "files": [
1098 "${libdir}/python3.5/unittest", 1096 "${libdir}/python3.5/unittest",
1099 "${libdir}/python3.5/unittest/" 1097 "${libdir}/python3.5/unittest/",
1098 "${libdir}/python3.5/unittest/__pycache__"
1100 ], 1099 ],
1101 "rdepends": [ 1100 "rdepends": [
1102 "core", 1101 "core",
@@ -1136,11 +1135,10 @@
1136 "summary": "Python basic XML support" 1135 "summary": "Python basic XML support"
1137 }, 1136 },
1138 "xmlrpc": { 1137 "xmlrpc": {
1139 "cached": [ 1138 "cached": [],
1140 "${libdir}/python3.5/xmlrpc/__pycache__"
1141 ],
1142 "files": [ 1139 "files": [
1143 "${libdir}/python3.5/xmlrpc" 1140 "${libdir}/python3.5/xmlrpc",
1141 "${libdir}/python3.5/xmlrpc/__pycache__"
1144 ], 1142 ],
1145 "rdepends": [ 1143 "rdepends": [
1146 "core", 1144 "core",