summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorAlejandro Enedino Hernandez Samaniego <alejandro.enedino.hernandez-samaniego@xilinx.com>2018-03-29 23:28:16 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-31 09:48:42 +0100
commit5d288d286e0adb221649d896c132a607ecddc490 (patch)
tree80712d2cae1b8eed27061ca1d6c44b7cda48b9b9 /meta/recipes-devtools
parentdfd5dc1f55bd75068f2a459f67778d23cefc95a4 (diff)
downloadpoky-5d288d286e0adb221649d896c132a607ecddc490.tar.gz
python3: fix create_manifest to handle pycache folders
We have a couple of python modules that contain folders themselves, for that reason they also contain a __pycache__ folder inside those directories, since we include the whole folder in the manifest, the pycache directories end up with the files and not the cache files. This patch catches that and adds the directories to the correct structure. (From OE-Core rev: df9401e7e69ce162e257e827d67eb217666e532d) Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandr@xilinx.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-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, 15 insertions, 10 deletions
diff --git a/meta/recipes-devtools/python/python3/create_manifest3.py b/meta/recipes-devtools/python/python3/create_manifest3.py
index ead27e9fcc..43e95ce96b 100644
--- a/meta/recipes-devtools/python/python3/create_manifest3.py
+++ b/meta/recipes-devtools/python/python3/create_manifest3.py
@@ -186,7 +186,10 @@ for key in old_manifest:
186 # Ignore folders, since we don't import those, difficult to handle multilib 186 # Ignore folders, since we don't import those, difficult to handle multilib
187 if isFolder(value): 187 if isFolder(value):
188 # Pass folders directly 188 # Pass folders directly
189 new_manifest[key]['files'].append(value) 189 if isCached(value):
190 new_manifest[key]['cached'].append(value)
191 else:
192 new_manifest[key]['files'].append(value)
190 # Ignore binaries, since we don't import those 193 # Ignore binaries, since we don't import those
191 if '${bindir}' in value: 194 if '${bindir}' in value:
192 # 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 95071c53f5..911be8e971 100644
--- a/meta/recipes-devtools/python/python3/python3-manifest.json
+++ b/meta/recipes-devtools/python/python3/python3-manifest.json
@@ -737,21 +737,21 @@
737 "${libdir}/python3.5/__pycache__/poplib.*.pyc", 737 "${libdir}/python3.5/__pycache__/poplib.*.pyc",
738 "${libdir}/python3.5/__pycache__/smtplib.*.pyc", 738 "${libdir}/python3.5/__pycache__/smtplib.*.pyc",
739 "${libdir}/python3.5/__pycache__/telnetlib.*.pyc", 739 "${libdir}/python3.5/__pycache__/telnetlib.*.pyc",
740 "${libdir}/python3.5/__pycache__/uuid.*.pyc" 740 "${libdir}/python3.5/__pycache__/uuid.*.pyc",
741 "${libdir}/python3.5/http/__pycache__",
742 "${libdir}/python3.5/urllib/__pycache__"
741 ], 743 ],
742 "files": [ 744 "files": [
743 "${libdir}/python3.5/base64.py", 745 "${libdir}/python3.5/base64.py",
744 "${libdir}/python3.5/ftplib.py", 746 "${libdir}/python3.5/ftplib.py",
745 "${libdir}/python3.5/hmac.py", 747 "${libdir}/python3.5/hmac.py",
746 "${libdir}/python3.5/http", 748 "${libdir}/python3.5/http",
747 "${libdir}/python3.5/http/__pycache__",
748 "${libdir}/python3.5/mimetypes.py", 749 "${libdir}/python3.5/mimetypes.py",
749 "${libdir}/python3.5/nntplib.py", 750 "${libdir}/python3.5/nntplib.py",
750 "${libdir}/python3.5/poplib.py", 751 "${libdir}/python3.5/poplib.py",
751 "${libdir}/python3.5/smtplib.py", 752 "${libdir}/python3.5/smtplib.py",
752 "${libdir}/python3.5/telnetlib.py", 753 "${libdir}/python3.5/telnetlib.py",
753 "${libdir}/python3.5/urllib", 754 "${libdir}/python3.5/urllib",
754 "${libdir}/python3.5/urllib/__pycache__",
755 "${libdir}/python3.5/uuid.py" 755 "${libdir}/python3.5/uuid.py"
756 ], 756 ],
757 "rdepends": [ 757 "rdepends": [
@@ -1088,11 +1088,12 @@
1088 "summary": "Python typing support" 1088 "summary": "Python typing support"
1089 }, 1089 },
1090 "unittest": { 1090 "unittest": {
1091 "cached": [], 1091 "cached": [
1092 "${libdir}/python3.5/unittest/__pycache__"
1093 ],
1092 "files": [ 1094 "files": [
1093 "${libdir}/python3.5/unittest", 1095 "${libdir}/python3.5/unittest",
1094 "${libdir}/python3.5/unittest/", 1096 "${libdir}/python3.5/unittest/"
1095 "${libdir}/python3.5/unittest/__pycache__"
1096 ], 1097 ],
1097 "rdepends": [ 1098 "rdepends": [
1098 "core", 1099 "core",
@@ -1132,11 +1133,12 @@
1132 "summary": "Python basic XML support" 1133 "summary": "Python basic XML support"
1133 }, 1134 },
1134 "xmlrpc": { 1135 "xmlrpc": {
1135 "cached": [], 1136 "cached": [
1136 "files": [
1137 "${libdir}/python3.5/xmlrpc",
1138 "${libdir}/python3.5/xmlrpc/__pycache__" 1137 "${libdir}/python3.5/xmlrpc/__pycache__"
1139 ], 1138 ],
1139 "files": [
1140 "${libdir}/python3.5/xmlrpc"
1141 ],
1140 "rdepends": [ 1142 "rdepends": [
1141 "core", 1143 "core",
1142 "xml" 1144 "xml"