From: Anibal Limon <anibal@limonsoftware.com>
To: bitbake-devel@lists.openembedded.org
Cc: alex@linutronix.de, Anibal Limon <anibal@limonsoftware.com>
Subject: [PATCHv2] bitbake-setup: _has_local_modifications fix user case when add/remove/add layer
Date: Wed, 28 Jan 2026 13:31:56 -0600 [thread overview]
Message-ID: <20260128193156.2019850-1-anibal@limonsoftware.com> (raw)
While develop a registry configuration adding a new layer and then back
to previous configuration without the _has_local_modifications breaks
because the code expects the layer to be in sources-fixed-revisions.json.
This can be reproduced with next steps:
- Call bitbake-setup with configX.
- Remove a LayerY from the configX.
- Call bitbake-setup with configX.
- Add the layerY again to configX.
- Call bitbake-setup with configX (break).
Fixes:
```
File "/workspaces/ls/meta-ls/bitbake/bin/bitbake-setup", line 1137, in <module>
main()
~~~~^^
File "/workspaces/ls/meta-ls/bitbake/bin/bitbake-setup", line 1130, in main
args.func(top_dir, all_settings, args, d)
~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspaces/ls/meta-ls/bitbake/bin/bitbake-setup", line 735, in build_update
build_status(top_dir, settings, args, d, update=True)
~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspaces/ls/meta-ls/bitbake/bin/bitbake-setup", line 719, in build_status
update_build(new_upstream_config, confdir, setupdir, layerdir, d,
~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
update_bb_conf=args.update_bb_conf)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/workspaces/ls/meta-ls/bitbake/bin/bitbake-setup", line 408, in update_build
sources_fixed_revisions = checkout_layers(layer_config, confdir, layerdir, d)
File "/workspaces/ls/meta-ls/bitbake/bin/bitbake-setup", line 184, in checkout_layers
elif _has_local_modifications(r_name, repodir_path):
~~~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^
File "/workspaces/ls/meta-ls/bitbake/bin/bitbake-setup", line 143, in _has_local_modifications
rev = fixed_revisions['sources'][r_name]['git-remote']['rev']
~~~~~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^
KeyError: 'meta-freescale'
```
Signed-off-by: Anibal Limon <anibal@limonsoftware.com>
---
bin/bitbake-setup | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/bin/bitbake-setup b/bin/bitbake-setup
index 4d709ed8c..5e0f15555 100755
--- a/bin/bitbake-setup
+++ b/bin/bitbake-setup
@@ -140,6 +140,12 @@ def checkout_layers(layers, confdir, layerdir, d):
def _has_local_modifications(r_name, r_path):
fixed_revisions = json.load(open(os.path.join(confdir, "sources-fixed-revisions.json")))
+
+ if not r_name in fixed_revisions['sources']:
+ logger.warning("""Source {} in {} doesn't have an entry in sources-fixed-revisions.json,
+ Source {} was previously remove from configuration.""".format(r_name, r_path, r_name))
+ return True
+
rev = fixed_revisions['sources'][r_name]['git-remote']['rev']
status = bb.process.run('git -C {} status --porcelain'.format(r_path))[0]
if status:
--
2.51.0
next reply other threads:[~2026-01-28 19:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-28 19:31 Anibal Limon [this message]
2026-01-29 11:22 ` [bitbake-devel] [PATCHv2] bitbake-setup: _has_local_modifications fix user case when add/remove/add layer Alexander Kanavin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260128193156.2019850-1-anibal@limonsoftware.com \
--to=anibal@limonsoftware.com \
--cc=alex@linutronix.de \
--cc=bitbake-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox