mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-05 16:28:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

python3: fix create_manifest to handle pycache folders

Browse Source 
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>
This commit is contained in:
Alejandro Enedino Hernandez Samaniego
2018-03-29 23:28:16 -07:00
committed by Richard Purdie
parent dfd5dc1f55
commit 5d288d286e
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
meta/recipes-devtools/python/python3/create_manifest3.py
View File

@@ -186,7 +186,10 @@ for key in old_manifest:
# Ignore folders, since we don't import those, difficult to handle multilib
if isFolder(value):
# Pass folders directly
new_manifest[key]['files'].append(value)
if isCached(value):
new_manifest[key]['cached'].append(value)
else:
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

20
meta/recipes-devtools/python/python3/python3-manifest.json
View File

@@ -737,21 +737,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/__pycache__/uuid.*.pyc",
"${libdir}/python3.5/http/__pycache__",
"${libdir}/python3.5/urllib/__pycache__"
],
"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": [
@@ -1088,11 +1088,12 @@
"summary": "Python typing support"
},
"unittest": {
"cached": [],
"cached": [
"${libdir}/python3.5/unittest/__pycache__"
],
"files": [
"${libdir}/python3.5/unittest",
"${libdir}/python3.5/unittest/",
"${libdir}/python3.5/unittest/__pycache__"
"${libdir}/python3.5/unittest/"
],
"rdepends": [
"core",
@@ -1132,11 +1133,12 @@
"summary": "Python basic XML support"
},
"xmlrpc": {
"cached": [],
"files": [
"${libdir}/python3.5/xmlrpc",
"cached": [
"${libdir}/python3.5/xmlrpc/__pycache__"
],
"files": [
"${libdir}/python3.5/xmlrpc"
],
"rdepends": [
"core",
"xml"