* [PATCH 1/2] bitbake: layerindex: Fix bitbake-layers layerindex-show-depends command
@ 2021-04-16 16:07 Diego Sueiro
2021-04-16 16:07 ` [PATCH 2/2] bitbake: layerindex: Add --fetchdir parameter to layerindex-fetch Diego Sueiro
2021-04-20 22:31 ` [bitbake-devel] [PATCH 1/2] bitbake: layerindex: Fix bitbake-layers layerindex-show-depends command Paul Eggleton
0 siblings, 2 replies; 6+ messages in thread
From: Diego Sueiro @ 2021-04-16 16:07 UTC (permalink / raw)
To: bitbake-devel; +Cc: nd, Diego Sueiro
Running 'bitbake-layers layerindex-show-depends meta-filesystems' fails with:
```
Traceback (most recent call last):
File "<...>/poky/bitbake/bin/bitbake-layers", line 93, in <module>
ret = main()
File "<...>/poky/bitbake/bin/bitbake-layers", line 86, in main
return args.func(args)
File "<...>/poky/bitbake/lib/bblayers/layerindex.py", line 209, in do_layerindex_show_depends
self.do_layerindex_fetch(args)
File "<...>/poky/bitbake/lib/bblayers/layerindex.py", line 182, in do_layerindex_fetch
args.shallow)
AttributeError: 'Namespace' object has no attribute 'shallow'
```
Initialize the shallow attribute to fix it.
Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
---
bitbake/lib/bblayers/layerindex.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/bitbake/lib/bblayers/layerindex.py b/bitbake/lib/bblayers/layerindex.py
index b2f27b21ee..17dfc9874d 100644
--- a/bitbake/lib/bblayers/layerindex.py
+++ b/bitbake/lib/bblayers/layerindex.py
@@ -206,6 +206,7 @@ class LayerIndexPlugin(ActionPlugin):
"""
args.show_only = True
args.ignore = []
+ args.shallow = True
self.do_layerindex_fetch(args)
def register_commands(self, sp):
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] bitbake: layerindex: Add --fetchdir parameter to layerindex-fetch
2021-04-16 16:07 [PATCH 1/2] bitbake: layerindex: Fix bitbake-layers layerindex-show-depends command Diego Sueiro
@ 2021-04-16 16:07 ` Diego Sueiro
2021-04-20 22:30 ` [bitbake-devel] " Paul Eggleton
2021-04-20 22:31 ` [bitbake-devel] [PATCH 1/2] bitbake: layerindex: Fix bitbake-layers layerindex-show-depends command Paul Eggleton
1 sibling, 1 reply; 6+ messages in thread
From: Diego Sueiro @ 2021-04-16 16:07 UTC (permalink / raw)
To: bitbake-devel; +Cc: nd, Diego Sueiro
Introduce --fetchdir parameter to layerindex-fetch enabling users to choose
the directory to fetch the layers different from BBLAYERS_FETCH_DIR.
Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
---
bitbake/lib/bblayers/layerindex.py | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/bitbake/lib/bblayers/layerindex.py b/bitbake/lib/bblayers/layerindex.py
index 17dfc9874d..5816d70bfa 100644
--- a/bitbake/lib/bblayers/layerindex.py
+++ b/bitbake/lib/bblayers/layerindex.py
@@ -159,12 +159,17 @@ class LayerIndexPlugin(ActionPlugin):
logger.plain(' recommended by: %s' % ' '.join(recommendedby))
if dependencies:
- fetchdir = self.tinfoil.config_data.getVar('BBLAYERS_FETCH_DIR')
- if not fetchdir:
- logger.error("Cannot get BBLAYERS_FETCH_DIR")
- return 1
+ if args.fetchdir:
+ fetchdir = args.fetchdir
+ else:
+ fetchdir = self.tinfoil.config_data.getVar('BBLAYERS_FETCH_DIR')
+ if not fetchdir:
+ logger.error("Cannot get BBLAYERS_FETCH_DIR")
+ return 1
+
if not os.path.exists(fetchdir):
os.makedirs(fetchdir)
+
addlayers = []
for deplayerbranch in dependencies:
@@ -206,6 +211,7 @@ class LayerIndexPlugin(ActionPlugin):
"""
args.show_only = True
args.ignore = []
+ args.fetchdir = ""
args.shallow = True
self.do_layerindex_fetch(args)
@@ -215,6 +221,7 @@ class LayerIndexPlugin(ActionPlugin):
parser_layerindex_fetch.add_argument('-b', '--branch', help='branch name to fetch')
parser_layerindex_fetch.add_argument('-s', '--shallow', help='do only shallow clones (--depth=1)', action='store_true')
parser_layerindex_fetch.add_argument('-i', '--ignore', help='assume the specified layers do not need to be fetched/added (separate multiple layers with commas, no spaces)', metavar='LAYER')
+ parser_layerindex_fetch.add_argument('-f', '--fetchdir', help='directory to fetch the layers')
parser_layerindex_fetch.add_argument('layername', nargs='+', help='layer to fetch')
parser_layerindex_show_depends = self.add_command(sp, 'layerindex-show-depends', self.do_layerindex_show_depends, parserecipes=False)
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [bitbake-devel] [PATCH 2/2] bitbake: layerindex: Add --fetchdir parameter to layerindex-fetch
2021-04-16 16:07 ` [PATCH 2/2] bitbake: layerindex: Add --fetchdir parameter to layerindex-fetch Diego Sueiro
@ 2021-04-20 22:30 ` Paul Eggleton
2021-04-21 7:33 ` Diego Sueiro
0 siblings, 1 reply; 6+ messages in thread
From: Paul Eggleton @ 2021-04-20 22:30 UTC (permalink / raw)
To: Diego Sueiro; +Cc: bitbake-devel
Hi Diego
On Saturday, 17 April 2021 04:07:11 NZST Diego Sueiro wrote:
> Introduce --fetchdir parameter to layerindex-fetch enabling users to choose
> parser_layerindex_fetch.add_argument('-f', '--fetchdir', help='directory to fetch the layers')
For the help text I would suggest "directory to fetch the layer(s) into (will be created if it does not exist)", but otherwise looks good.
Cheers
Paul
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [bitbake-devel] [PATCH 1/2] bitbake: layerindex: Fix bitbake-layers layerindex-show-depends command
2021-04-16 16:07 [PATCH 1/2] bitbake: layerindex: Fix bitbake-layers layerindex-show-depends command Diego Sueiro
2021-04-16 16:07 ` [PATCH 2/2] bitbake: layerindex: Add --fetchdir parameter to layerindex-fetch Diego Sueiro
@ 2021-04-20 22:31 ` Paul Eggleton
2021-04-21 7:33 ` Diego Sueiro
1 sibling, 1 reply; 6+ messages in thread
From: Paul Eggleton @ 2021-04-20 22:31 UTC (permalink / raw)
To: Diego Sueiro; +Cc: bitbake-devel
Hi Diego
On Saturday, 17 April 2021 04:07:10 NZST Diego Sueiro wrote:
> Running 'bitbake-layers layerindex-show-depends meta-filesystems' fails
> with: ```
> Traceback (most recent call last):
> File "<...>/poky/bitbake/bin/bitbake-layers", line 93, in <module>
> ret = main()
> File "<...>/poky/bitbake/bin/bitbake-layers", line 86, in main
> return args.func(args)
> File "<...>/poky/bitbake/lib/bblayers/layerindex.py", line 209, in
> do_layerindex_show_depends self.do_layerindex_fetch(args)
> File "<...>/poky/bitbake/lib/bblayers/layerindex.py", line 182, in
> do_layerindex_fetch args.shallow)
> AttributeError: 'Namespace' object has no attribute 'shallow'
> ```
>
> Initialize the shallow attribute to fix it.
>
> Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
> ---
> bitbake/lib/bblayers/layerindex.py | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/bitbake/lib/bblayers/layerindex.py
> b/bitbake/lib/bblayers/layerindex.py index b2f27b21ee..17dfc9874d 100644
> --- a/bitbake/lib/bblayers/layerindex.py
> +++ b/bitbake/lib/bblayers/layerindex.py
> @@ -206,6 +206,7 @@ class LayerIndexPlugin(ActionPlugin):
> """
> args.show_only = True
> args.ignore = []
> + args.shallow = True
Hmm, yes. We could probably use a test that ensures this doesn't regress
again. Is that something you would be able to look at?
Thanks
Paul
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [bitbake-devel] [PATCH 2/2] bitbake: layerindex: Add --fetchdir parameter to layerindex-fetch
2021-04-20 22:30 ` [bitbake-devel] " Paul Eggleton
@ 2021-04-21 7:33 ` Diego Sueiro
0 siblings, 0 replies; 6+ messages in thread
From: Diego Sueiro @ 2021-04-21 7:33 UTC (permalink / raw)
To: Paul Eggleton; +Cc: bitbake-devel, nd
>-----Original Message-----
>From: Paul Eggleton <bluelightning@bluelightning.org>
>Sent: 20 April 2021 23:31
>To: Diego Sueiro <Diego.Sueiro@arm.com>
>Cc: bitbake-devel@lists.openembedded.org
>Subject: Re: [bitbake-devel] [PATCH 2/2] bitbake: layerindex: Add --fetchdir
>parameter to layerindex-fetch
>
>Hi Diego
>
>On Saturday, 17 April 2021 04:07:11 NZST Diego Sueiro wrote:
>> Introduce --fetchdir parameter to layerindex-fetch enabling users to
>> choose parser_layerindex_fetch.add_argument('-f', '--fetchdir',
>> help='directory to fetch the layers')
>
>For the help text I would suggest "directory to fetch the layer(s) into (will be
>created if it does not exist)", but otherwise looks good.
>
Sure, I'll update the patch.
Cheers,
Diego Sueiro
>Cheers
>Paul
>
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [bitbake-devel] [PATCH 1/2] bitbake: layerindex: Fix bitbake-layers layerindex-show-depends command
2021-04-20 22:31 ` [bitbake-devel] [PATCH 1/2] bitbake: layerindex: Fix bitbake-layers layerindex-show-depends command Paul Eggleton
@ 2021-04-21 7:33 ` Diego Sueiro
0 siblings, 0 replies; 6+ messages in thread
From: Diego Sueiro @ 2021-04-21 7:33 UTC (permalink / raw)
To: bluelightning; +Cc: bitbake-devel, nd
>-----Original Message-----
>From: bitbake-devel@lists.openembedded.org <bitbake-
>devel@lists.openembedded.org> On Behalf Of Paul Eggleton via
>lists.openembedded.org
>Sent: 20 April 2021 23:32
>To: Diego Sueiro <Diego.Sueiro@arm.com>
>Cc: bitbake-devel@lists.openembedded.org
>Subject: Re: [bitbake-devel] [PATCH 1/2] bitbake: layerindex: Fix bitbake-
>layers layerindex-show-depends command
>
>Hi Diego
>
>On Saturday, 17 April 2021 04:07:10 NZST Diego Sueiro wrote:
>> Running 'bitbake-layers layerindex-show-depends meta-filesystems'
>> fails
>> with: ```
>> Traceback (most recent call last):
>> File "<...>/poky/bitbake/bin/bitbake-layers", line 93, in <module>
>> ret = main()
>> File "<...>/poky/bitbake/bin/bitbake-layers", line 86, in main
>> return args.func(args)
>> File "<...>/poky/bitbake/lib/bblayers/layerindex.py", line 209, in
>> do_layerindex_show_depends self.do_layerindex_fetch(args)
>> File "<...>/poky/bitbake/lib/bblayers/layerindex.py", line 182, in
>> do_layerindex_fetch args.shallow)
>> AttributeError: 'Namespace' object has no attribute 'shallow'
>> ```
>>
>> Initialize the shallow attribute to fix it.
>>
>> Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
>> ---
>> bitbake/lib/bblayers/layerindex.py | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/bitbake/lib/bblayers/layerindex.py
>> b/bitbake/lib/bblayers/layerindex.py index b2f27b21ee..17dfc9874d
>> 100644
>> --- a/bitbake/lib/bblayers/layerindex.py
>> +++ b/bitbake/lib/bblayers/layerindex.py
>> @@ -206,6 +206,7 @@ class LayerIndexPlugin(ActionPlugin):
>> """
>> args.show_only = True
>> args.ignore = []
>> + args.shallow = True
>
>Hmm, yes. We could probably use a test that ensures this doesn't regress
>again. Is that something you would be able to look at?
>
Sure, I'll prepare a patch.
Cheers,
Diego Sueiro
>Thanks
>Paul
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-04-21 7:33 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-16 16:07 [PATCH 1/2] bitbake: layerindex: Fix bitbake-layers layerindex-show-depends command Diego Sueiro
2021-04-16 16:07 ` [PATCH 2/2] bitbake: layerindex: Add --fetchdir parameter to layerindex-fetch Diego Sueiro
2021-04-20 22:30 ` [bitbake-devel] " Paul Eggleton
2021-04-21 7:33 ` Diego Sueiro
2021-04-20 22:31 ` [bitbake-devel] [PATCH 1/2] bitbake: layerindex: Fix bitbake-layers layerindex-show-depends command Paul Eggleton
2021-04-21 7:33 ` Diego Sueiro
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.