| Message ID | 20180328201929.6810-1-ross.burton@intel.com |
|---|---|
| State | Accepted |
| Commit | f06a8d20560b8e93cf875ee58eddda0a976e7b14 |
| Headers | show |
| Series | python3: consolidate sqlite3 files | expand |
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.
> 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 <ross.burton@intel.com>
> ---
> meta/recipes-devtools/python/python3/python3-manifest.json | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-devtools/python/python3/python3-manifest.json b/meta/recipes-devtools/python/python3/python3-manifest.json
> index 1914a4c43ba..95071c53f5a 100644
> --- a/meta/recipes-devtools/python/python3/python3-manifest.json
> +++ b/meta/recipes-devtools/python/python3/python3-manifest.json
> @@ -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.
> + "${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
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Hey Ross, I just sent you a patch that goes on top of this that fixes things. Thanks Alejandro -----Original Message----- From: openembedded-core-bounces@lists.openembedded.org [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of Alejandro Enedino Hernandez Samaniego Sent: Thursday, March 29, 2018 7:14 PM To: openembedded-core@lists.openembedded.org 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. > 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 <ross.burton@intel.com> > --- > meta/recipes-devtools/python/python3/python3-manifest.json | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git > a/meta/recipes-devtools/python/python3/python3-manifest.json > b/meta/recipes-devtools/python/python3/python3-manifest.json > index 1914a4c43ba..95071c53f5a 100644 > --- a/meta/recipes-devtools/python/python3/python3-manifest.json > +++ b/meta/recipes-devtools/python/python3/python3-manifest.json > @@ -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. > + "${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 Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
diff --git a/meta/recipes-devtools/python/python3/python3-manifest.json b/meta/recipes-devtools/python/python3/python3-manifest.json index 1914a4c43ba..95071c53f5a 100644 --- a/meta/recipes-devtools/python/python3/python3-manifest.json +++ b/meta/recipes-devtools/python/python3/python3-manifest.json @@ -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"
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 <ross.burton@intel.com> --- meta/recipes-devtools/python/python3/python3-manifest.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core