diff mbox series

[2/4] bitbake-setup: override complete source entries, not just the git-remote properties

Message ID 20251211142532.983960-2-alex.kanavin@gmail.com
State New
Headers show
Series [1/4] setup-schema/layers.schema.json: correct indentation | expand

Commit Message

Alexander Kanavin Dec. 11, 2025, 2:25 p.m. UTC 
From: Alexander Kanavin <alex@linutronix.de>

The code was assuming that a source entry always contains
a git-remote property, and that is the only property that
should be replaced.

With upcoming introduction of local sources (using 'local' as a
property as an alternative to the existing 'git-remote'
property) that is no longer true.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 bin/bitbake-setup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Paul Barker Dec. 12, 2025, 11:31 a.m. UTC | #1 
On Thu, 2025-12-11 at 15:25 +0100, Alexander Kanavin wrote:
> From: Alexander Kanavin <alex@linutronix.de>
> 
> The code was assuming that a source entry always contains
> a git-remote property, and that is the only property that
> should be replaced.
> 
> With upcoming introduction of local sources (using 'local' as a
> property as an alternative to the existing 'git-remote'
> property) that is no longer true.
> 
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  bin/bitbake-setup | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/bin/bitbake-setup b/bin/bitbake-setup
> index b1d751899..8d4e9769a 100755
> --- a/bin/bitbake-setup
> +++ b/bin/bitbake-setup
> @@ -323,7 +323,7 @@ def update_build(config, confdir, setupdir, layerdir, d, update_bb_conf="prompt"
>      layer_overrides = config["source-overrides"]["sources"]
>      for k,v in layer_overrides.items():
>          if k in layer_config:
> -            layer_config[k]["git-remote"] = v["git-remote"]
> +            layer_config[k] = v
>      sources_fixed_revisions = checkout_layers(layer_config, layerdir, d)
>      bitbake_config = config["bitbake-config"]
>      thisdir = os.path.dirname(config["path"]) if config["type"] == 'local' else None

Reviewed-by: Paul Barker <paul@pbarker.dev>

Best regards,
diff mbox series

Patch

diff --git a/bin/bitbake-setup b/bin/bitbake-setup
index b1d751899..8d4e9769a 100755
--- a/bin/bitbake-setup
+++ b/bin/bitbake-setup
@@ -323,7 +323,7 @@  def update_build(config, confdir, setupdir, layerdir, d, update_bb_conf="prompt"
     layer_overrides = config["source-overrides"]["sources"]
     for k,v in layer_overrides.items():
         if k in layer_config:
-            layer_config[k]["git-remote"] = v["git-remote"]
+            layer_config[k] = v
     sources_fixed_revisions = checkout_layers(layer_config, layerdir, d)
     bitbake_config = config["bitbake-config"]
     thisdir = os.path.dirname(config["path"]) if config["type"] == 'local' else None