Re: [bitbake-devel] [PATCH] Support add-layer to prepend

[Alexandre Belloni <alexandre.belloni@bootlin.com>]

Hello,

Your patch doesn't apply, it is missing whitespaces at the beginning of
lines. Can you fix and resend?

Thanks!

On 05/02/2024 03:31:13-0800, nvhieudt11@gmail.com wrote:
> As you know, layer order in BBLAYERS can affect in parsing recipes process,
> in some cases, users want to add a layer on the top of BBLAYERS variable
> 
> So, add "--prepend" option for bitbake-layers to support add-layer to prepend
> 
> Signed-off-by: Hieu Van Nguyen <hieu2.nguyen@lge.com>
> ---
> lib/bb/utils.py� � � � | 7 +++++--
> lib/bblayers/action.py | 3 ++-
> 2 files changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/lib/bb/utils.py b/lib/bb/utils.py
> index 068b631c..086f1cc8 100644
> --- a/lib/bb/utils.py
> +++ b/lib/bb/utils.py
> @@ -1412,7 +1412,7 @@ def edit_metadata_file(meta_file, variables, varfunc):
> return updated
> 
> -def edit_bblayers_conf(bblayers_conf, add, remove, edit_cb=None):
> +def edit_bblayers_conf(bblayers_conf, add, remove, prepend=None, edit_cb=None):
> """Edit bblayers.conf, adding and/or removing layers
> Parameters:
> bblayers_conf: path to bblayers.conf file to edit
> @@ -1482,7 +1482,10 @@ def edit_bblayers_conf(bblayers_conf, add, remove, edit_cb=None):
> for addlayer in addlayers:
> if addlayer not in bblayers:
> updated = True
> -� � � � � � � � � � bblayers.append(addlayer)
> +� � � � � � � � � � if prepend:
> +� � � � � � � � � � � � bblayers.insert(0,addlayer)
> +� � � � � � � � � � else:
> +� � � � � � � � � � � � bblayers.append(addlayer)
> del addlayers[:]
> 
> if edit_cb:
> diff --git a/lib/bblayers/action.py b/lib/bblayers/action.py
> index a8f26993..57d7195c 100644
> --- a/lib/bblayers/action.py
> +++ b/lib/bblayers/action.py
> @@ -49,7 +49,7 @@ class ActionPlugin(LayerPlugin):
> shutil.copy2(bblayers_conf, backup)
> 
> try:
> -� � � � � � notadded, _ = bb.utils.edit_bblayers_conf(bblayers_conf, layerdirs, None)
> +� � � � � � notadded, _ = bb.utils.edit_bblayers_conf(bblayers_conf, layerdirs, None, args.prepend)
> self.tinfoil.modified_files()
> if not (args.force or notadded):
> try:
> @@ -267,6 +267,7 @@ build results (as the layer priority order has effectively changed).
> def register_commands(self, sp):
> parser_add_layer = self.add_command(sp, 'add-layer', self.do_add_layer, parserecipes=False)
> parser_add_layer.add_argument('layerdir', nargs='+', help='Layer directory/directories to add')
> +� � � � parser_add_layer.add_argument('--prepend', action='store_true', help='Prepend layer directory/directories')
> 
> parser_remove_layer = self.add_command(sp, 'remove-layer', self.do_remove_layer, parserecipes=False)
> parser_remove_layer.add_argument('layerdir', nargs='+', help='Layer directory/directories to remove (wildcards allowed, enclose in quotes to avoid shell expansion)')
> --
> 2.43.0

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#15823): https://lists.openembedded.org/g/bitbake-devel/message/15823
> Mute This Topic: https://lists.openembedded.org/mt/104173959/3617179
> Group Owner: bitbake-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/bitbake-devel/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 


-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com