mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

rm_work.bbclass: use HOSTTOOLS 'rm' binary exclusively

Browse Source 
The do_rm_work() task is using the first available 'rm' binary
available in PATH to remove files and folders.
However, depending on the PATH setup and RECIPE_SYSROOT_NATIVE
contents, the function can be using the 'rm' binary available
in RECIPE_SYSROOT_NATIVE, a folder that will get removed.
This causes a sporadic race-condition when trying to access the
'rm' binary of a folder already deleted.
Solve this by exclusively using the HOSTTOOLS 'rm' binary, as
this folder will not get removed.

(From OE-Core rev: edcd9ad333bc4e504594e8af83e8cb7007d2e35c)

Signed-off-by: Luis Martins <luis.pinto.martins@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Luis
2022-12-24 01:49:46 +00:00
committed by Richard Purdie
parent f27e91305b
commit 4e75ed32a0
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/rm_work.bbclass
+11 -4
View File
@@ -33,6 +33,13 @@ BB_SCHEDULER ?= "completion"
BB_TASK_IONICE_LEVEL:task-rm_work = "3.0" BB_TASK_IONICE_LEVEL:task-rm_work = "3.0"
do_rm_work () { do_rm_work () {
# Force using the HOSTTOOLS 'rm' - otherwise the SYSROOT_NATIVE 'rm' can be selected depending on PATH
# Avoids race-condition accessing 'rm' when deleting WORKDIR folders at the end of this function
RM_BIN="$(PATH=${HOSTTOOLS_DIR} command -v rm)"
if [ -z "${RM_BIN}" ]; then
bbfatal "Binary 'rm' not found in HOSTTOOLS_DIR, cannot remove WORKDIR data."
fi
# If the recipe name is in the RM_WORK_EXCLUDE, skip the recipe. # If the recipe name is in the RM_WORK_EXCLUDE, skip the recipe.
for p in ${RM_WORK_EXCLUDE}; do for p in ${RM_WORK_EXCLUDE}; do
if [ "$p" = "${PN}" ]; then if [ "$p" = "${PN}" ]; then
@@ -79,7 +86,7 @@ do_rm_work () {
# sstate version since otherwise we'd need to leave 'plaindirs' around # sstate version since otherwise we'd need to leave 'plaindirs' around
# such as 'packages' and 'packages-split' and these can be large. No end # such as 'packages' and 'packages-split' and these can be large. No end
# of chain tasks depend directly on do_package anymore. # of chain tasks depend directly on do_package anymore.
rm -f -- $i; "${RM_BIN}" -f -- $i;
;; ;;
*_setscene*) *_setscene*)
# Skip stamps which are already setscene versions # Skip stamps which are already setscene versions
@@ -96,7 +103,7 @@ do_rm_work () {
;; ;;
esac esac
done done
rm -f -- $i "${RM_BIN}" -f -- $i
esac esac
done done
@@ -106,9 +113,9 @@ do_rm_work () {
# Retain only logs and other files in temp, safely ignore # Retain only logs and other files in temp, safely ignore
# failures of removing pseudo folers on NFS2/3 server. # failures of removing pseudo folers on NFS2/3 server.
if [ $dir = 'pseudo' ]; then if [ $dir = 'pseudo' ]; then
rm -rf -- $dir 2> /dev/null || true "${RM_BIN}" -rf -- $dir 2> /dev/null || true
elif ! echo "$excludes" | grep -q -w "$dir"; then elif ! echo "$excludes" | grep -q -w "$dir"; then
rm -rf -- $dir "${RM_BIN}" -rf -- $dir
fi fi
done done
} }