mbox series

[v2,0/9] Several fixes around recipetool appendsrcfile(s) and oe.recipeutils.bbappend_recipe

Message ID 20231204152603.831495-1-jstephan@baylibre.com
Headers show
Series Several fixes around recipetool appendsrcfile(s) and oe.recipeutils.bbappend_recipe | expand

Message

Julien Stephan Dec. 4, 2023, 3:25 p.m. UTC
Hi all,

I was trying to use recipetool appendsrcfile to add a file to a recipe and I noticed several issues:
* -m is not correctly supported
* recipetool appendsrfile(s) are missing a usefull dry-run mode
* appendsrc function relies on oe.recipeutils.bbappend_recipe but
  duplicates some code: it constructs itself the new src_uri entry
  although oe.recipeutils.bbappend_recipe is already doing it
* we are lacking a mode to patch the recipe itself

So this series tries to fix the issues above, fix the selftest
accordingly and add new test for -m and for "patch mode" (update recipe)
and also add a way to specify the name of the file to add
(in oe.recipeutils.bbappend_recipe)

Improvements from v1:
- in bbappend_recipe function remove old entry if an entry with different parameters already exists 
to avoid duplicate entries with different parameters

Link to v1: https://lists.openembedded.org/g/openembedded-core/message/191544


Julien Stephan (9):
  recipetool: appendsrcfile(s): add dry-run mode
  recipeutils: bbappend_recipe: fix undefined variable
  recipeutils: bbappend_recipe: add a way to specify the name of the
    file to add
  recipeutils: bbappend_recipe: remove old srcuri entry if parameters
    are different
  recipetool: appendsrcfile(s): use params instead of extraline
  recipeutils: bbappend_recipe: allow to patch the recipe itself
  recipetool: appendsrcfile(s): add a mode to update the recipe itself
  oeqa/selftest/recipetool: appendsrfile: add test for machine
  oeqa/selftest/recipetool: appendsrc: add test for update mode

 meta/lib/oe/recipeutils.py                 | 62 +++++++++++-----
 meta/lib/oeqa/selftest/cases/recipetool.py | 83 +++++++++++++++++++---
 scripts/lib/devtool/standard.py            |  6 +-
 scripts/lib/recipetool/append.py           | 63 +++++++++++-----
 4 files changed, 168 insertions(+), 46 deletions(-)

Comments

Alexandre Belloni Dec. 5, 2023, 7:47 a.m. UTC | #1
Hello,

The series doesn't apply on master, can you rebase?

On 04/12/2023 16:25:54+0100, Julien Stephan wrote:
> Hi all,
> 
> I was trying to use recipetool appendsrcfile to add a file to a recipe and I noticed several issues:
> * -m is not correctly supported
> * recipetool appendsrfile(s) are missing a usefull dry-run mode
> * appendsrc function relies on oe.recipeutils.bbappend_recipe but
>   duplicates some code: it constructs itself the new src_uri entry
>   although oe.recipeutils.bbappend_recipe is already doing it
> * we are lacking a mode to patch the recipe itself
> 
> So this series tries to fix the issues above, fix the selftest
> accordingly and add new test for -m and for "patch mode" (update recipe)
> and also add a way to specify the name of the file to add
> (in oe.recipeutils.bbappend_recipe)
> 
> Improvements from v1:
> - in bbappend_recipe function remove old entry if an entry with different parameters already exists 
> to avoid duplicate entries with different parameters
> 
> Link to v1: https://lists.openembedded.org/g/openembedded-core/message/191544
> 
> 
> Julien Stephan (9):
>   recipetool: appendsrcfile(s): add dry-run mode
>   recipeutils: bbappend_recipe: fix undefined variable
>   recipeutils: bbappend_recipe: add a way to specify the name of the
>     file to add
>   recipeutils: bbappend_recipe: remove old srcuri entry if parameters
>     are different
>   recipetool: appendsrcfile(s): use params instead of extraline
>   recipeutils: bbappend_recipe: allow to patch the recipe itself
>   recipetool: appendsrcfile(s): add a mode to update the recipe itself
>   oeqa/selftest/recipetool: appendsrfile: add test for machine
>   oeqa/selftest/recipetool: appendsrc: add test for update mode
> 
>  meta/lib/oe/recipeutils.py                 | 62 +++++++++++-----
>  meta/lib/oeqa/selftest/cases/recipetool.py | 83 +++++++++++++++++++---
>  scripts/lib/devtool/standard.py            |  6 +-
>  scripts/lib/recipetool/append.py           | 63 +++++++++++-----
>  4 files changed, 168 insertions(+), 46 deletions(-)
> 
> -- 
> 2.42.0
> 

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