python3: consolidate sqlite3 files
PATCH 1/1 python3: consolidate sqlite3 files
Some of the sqlite3 module was in python3-misc by accident, move the files into python3-sqlite3 where they belong.
--- meta/recipes-devtools/python/python3/python3-manifest.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
meta/recipes-devtools/python/python3/python3-manifest.json +5 -2
@@ -977,9 +977,12 @@ "summary": "Python Simple Mail Transport Daemon" }, "sqlite3": { - "cached": [], + "cached": [ + "${libdir}/python3.5/sqlite3/__pycache__/*.pyc" + ], "files": [ - "${libdir}/python3.5/lib-dynload/_sqlite3.*.so" + "${libdir}/python3.5/lib-dynload/_sqlite3.*.so", + "${libdir}/python3.5/sqlite3/*.py" ], "rdepends": [ "core"
Signature · 1 line
2.11.0
Hey Ross,
On 03/28/2018 01:19 PM, Ross Burton wrote:
python3-sqlite3 happens to be a very special and unique package, its folder inside ${libdir}/python3.5/ called sqlite3, which would be fine, we usually handle those packages by adding the whole folder, but in this case, we separated the sqlite3-tests (which is a folder inside the sqlite3 folder) into another package, so if we add the folder to sqlite3 there would be nothing for sqlite3-tests to get.
Quoted 13 lines
Some of the sqlite3 module was in python3-misc by accident, move the files into python3-sqlite3 where they belong.
Signed-off-by Ross Burton <[email protected]>--- meta/recipes-devtools/python/python3/python3-manifest.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)meta/recipes-devtools/python/python3/python3-manifest.json +0
-0
meta/recipes-devtools/python/python3/python3-manifest.json line 984
Quoted 10 lines
meta/recipes-devtools/python/python3/python3-manifest.json +4
-2@@ -977,9 +977,12 @@ "summary": "Python Simple Mail Transport Daemon" }, "sqlite3": { - "cached": [], + "cached": [ + "${libdir}/python3.5/sqlite3/__pycache__/*.pyc" + ], "files": [ - "${libdir}/python3.5/lib-dynload/_sqlite3.*.so" + "${libdir}/python3.5/lib-dynload/_sqlite3.*.so",
While this will work for splitting packages now, we dont support wildcards on the manifest file anymore, at least not for the whole filename, because when we try to get dependencies for a module the wildcard becomes useless, so this will likely kill the do_create_manifest task,
it'll go fine but the next time you run it, it wont get the module name it will disregard that dependency.
meta/recipes-devtools/python/python3/python3-manifest.json line 988
Quoted 4 lines
meta/recipes-devtools/python/python3/python3-manifest.json +1
-0+ "${libdir}/python3.5/sqlite3/*.py" ], "rdepends": [ "core"
The right way would be to get rid of sqlite3-tests but I know we cant do that, so I'm working on a fix for the do_create_manifest task that could handle this situation.
Hey Ross,
I just sent you a patch that goes on top of this that fixes things.
Thanks
Alejandro
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Alejandro Enedino Hernandez Samaniego
Sent: Thursday, March 29, 2018 7:14 PM
To: [email protected]
Subject: Re: [OE-core] [PATCH] python3: consolidate sqlite3 files
Hey Ross,
On 03/28/2018 01:19 PM, Ross Burton wrote:
python3-sqlite3 happens to be a very special and unique package, its folder inside ${libdir}/python3.5/ called sqlite3, which would be fine, we usually handle those packages by adding the whole folder, but in this case, we separated the sqlite3-tests (which is a folder inside the sqlite3 folder)
into another package, so if we add the folder to sqlite3 there would be nothing for sqlite3-tests to get.
Quoted 15 lines
Some of the sqlite3 module was in python3-misc by accident, move the files into python3-sqlite3 where they belong.
Signed-off-by Ross Burton <[email protected]>--- meta/recipes-devtools/python/python3/python3-manifest.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)(quoted diff) +0
-0
a/meta/recipes-devtools/python/python3/python3-manifest.jsonb/meta/recipes-devtools/python/python3/python3-manifest.jsonindex1914a4c43ba..95071c53f5a100644
meta/recipes-devtools/python/python3/python3-manifest.json line 984
Quoted 10 lines
meta/recipes-devtools/python/python3/python3-manifest.json +4
-2@@ -977,9 +977,12 @@ "summary": "Python Simple Mail Transport Daemon" }, "sqlite3": { - "cached": [], + "cached": [ + "${libdir}/python3.5/sqlite3/__pycache__/*.pyc" + ], "files": [ - "${libdir}/python3.5/lib-dynload/_sqlite3.*.so" + "${libdir}/python3.5/lib-dynload/_sqlite3.*.so",
While this will work for splitting packages now, we dont support wildcards on the manifest file anymore, at least not for the whole filename, because when we try to get dependencies for a module the wildcard becomes useless, so this will likely kill the do_create_manifest task, it'll go fine but the next time you run it, it wont get the module name it will disregard that dependency.
meta/recipes-devtools/python/python3/python3-manifest.json line 988
Quoted 4 lines
meta/recipes-devtools/python/python3/python3-manifest.json +1
-0+ "${libdir}/python3.5/sqlite3/*.py" ], "rdepends": [ "core"
The right way would be to get rid of sqlite3-tests but I know we cant do that, so I'm working on a fix for the do_create_manifest task that could handle this situation. --
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core