* [bitbake][dunfell][1.46][PATCH 0/2] Patch review
@ 2021-12-03 18:27 Steve Sakoman
2021-12-03 18:27 ` [bitbake][dunfell][1.46][PATCH 1/2] cooker: Ensure reparsing is handled correctly Steve Sakoman
2021-12-03 18:27 ` [bitbake][dunfell][1.46][PATCH 2/2] bblayers/action: When adding layers, catch BBHandledException Steve Sakoman
0 siblings, 2 replies; 3+ messages in thread
From: Steve Sakoman @ 2021-12-03 18:27 UTC (permalink / raw)
To: bitbake-devel
Please review this set of patches for dunfell/1.46 and have comments back by
end of day Tuesday.
Passed a-full on autobuilder:
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/2988
with the exception of a known autobuilder intermittent issue (on qemuppc test)
which passed on subsequent retest:
https://autobuilder.yoctoproject.org/typhoon/#/builders/63/builds/4402
The following changes since commit 7fdd43c5cbde38daa013076de2fdedcf3c3d3107:
process/knotty: Improve early exception handling (2021-11-22 04:15:15 -1000)
are available in the Git repository at:
git://git.openembedded.org/bitbake-contrib stable/1.46-nut
http://cgit.openembedded.org/bitbake-contrib/log/?h=stable/1.46-nut
Richard Purdie (2):
cooker: Ensure reparsing is handled correctly
bblayers/action: When adding layers, catch BBHandledException
lib/bb/cooker.py | 2 ++
lib/bblayers/action.py | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [bitbake][dunfell][1.46][PATCH 1/2] cooker: Ensure reparsing is handled correctly
2021-12-03 18:27 [bitbake][dunfell][1.46][PATCH 0/2] Patch review Steve Sakoman
@ 2021-12-03 18:27 ` Steve Sakoman
2021-12-03 18:27 ` [bitbake][dunfell][1.46][PATCH 2/2] bblayers/action: When adding layers, catch BBHandledException Steve Sakoman
1 sibling, 0 replies; 3+ messages in thread
From: Steve Sakoman @ 2021-12-03 18:27 UTC (permalink / raw)
To: bitbake-devel
From: Richard Purdie <richard.purdie@linuxfoundation.org>
From tinfoil, if you edit bblayers.conf and break it, then call
parseConfiguration (e.g. by adding a bad layer with bitbake-layers),
the system doens't show any parse error yet it should.
Add in a call to the updateCache function so that things really
are reparsed when requested.
Partially fixes [YOCTO #14054]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit e655f9361b9c3b77906b8e06b5cc76bc5180640e)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
lib/bb/cooker.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index 000faf82..8d9ca680 100644
--- a/lib/bb/cooker.py
+++ b/lib/bb/cooker.py
@@ -411,6 +411,8 @@ class BBCooker:
self.data.disableTracking()
def parseConfiguration(self):
+ self.updateCacheSync()
+
# Change nice level if we're asked to
nice = self.data.getVar("BB_NICE_LEVEL")
if nice:
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bitbake][dunfell][1.46][PATCH 2/2] bblayers/action: When adding layers, catch BBHandledException
2021-12-03 18:27 [bitbake][dunfell][1.46][PATCH 0/2] Patch review Steve Sakoman
2021-12-03 18:27 ` [bitbake][dunfell][1.46][PATCH 1/2] cooker: Ensure reparsing is handled correctly Steve Sakoman
@ 2021-12-03 18:27 ` Steve Sakoman
1 sibling, 0 replies; 3+ messages in thread
From: Steve Sakoman @ 2021-12-03 18:27 UTC (permalink / raw)
To: bitbake-devel
From: Richard Purdie <richard.purdie@linuxfoundation.org>
When adding a layer, parse error can occur, raising BBHandledException.
Catch this and error, aborting the layer add to meet user expectations.
[YOCTO #14054]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit ceddb5b3d229b83c172656053cd29aeb521fcce0)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
lib/bblayers/action.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/bblayers/action.py b/lib/bblayers/action.py
index d6459d66..d2f9c1bb 100644
--- a/lib/bblayers/action.py
+++ b/lib/bblayers/action.py
@@ -50,10 +50,10 @@ class ActionPlugin(LayerPlugin):
if not (args.force or notadded):
try:
self.tinfoil.run_command('parseConfiguration')
- except bb.tinfoil.TinfoilUIException:
+ except (bb.tinfoil.TinfoilUIException, bb.BBHandledException):
# Restore the back up copy of bblayers.conf
shutil.copy2(backup, bblayers_conf)
- bb.fatal("Parse failure with the specified layer added")
+ bb.fatal("Parse failure with the specified layer added, aborting.")
else:
for item in notadded:
sys.stderr.write("Specified layer %s is already in BBLAYERS\n" % item)
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-12-03 18:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-03 18:27 [bitbake][dunfell][1.46][PATCH 0/2] Patch review Steve Sakoman
2021-12-03 18:27 ` [bitbake][dunfell][1.46][PATCH 1/2] cooker: Ensure reparsing is handled correctly Steve Sakoman
2021-12-03 18:27 ` [bitbake][dunfell][1.46][PATCH 2/2] bblayers/action: When adding layers, catch BBHandledException Steve Sakoman
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.