From 29afbb5e1449d03cce34192193dfd9b85d5fb081 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 28 Jan 2023 15:44:30 +0000 Subject: scripts/bitbake-prserv-tool: Fix to work with memres bitbake Deleting data files whilst bitbake is running isn't a great idea. Make sure memory resident bitbake is stopped if present and make the file deletions a little more specific and safer too while we're here. Note: The cache directory layout is different on older releases (some are split level) so this won't be a direct backport to some. (From OE-Core rev: fa3f1f67abae1d90bede2e98bf7293603fd1307c) Signed-off-by: Richard Purdie --- scripts/bitbake-prserv-tool | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/bitbake-prserv-tool b/scripts/bitbake-prserv-tool index bed97bd8ac..80028342b1 100755 --- a/scripts/bitbake-prserv-tool +++ b/scripts/bitbake-prserv-tool @@ -17,8 +17,11 @@ help () clean_cache() { s=`bitbake -e | grep ^CACHE= | cut -f2 -d\"` + # Stop any active memory resident server + bitbake -m + # Remove cache entries since we want to trigger a full reparse if [ "x${s}" != "x" ]; then - rm -rf ${s} + rm -f ${s}/bb_cache*.dat.* fi } @@ -62,7 +65,7 @@ do_migrate_localcount () return 1 fi - rm -rf $df + rm -f $df clean_cache echo "Exporting LOCALCOUNT to AUTOINCs..." bitbake -R conf/migrate_localcount.conf -p -- cgit v1.2.3-54-g00ecf