mirror of
https://git.yoctoproject.org/poky
synced 2026-06-03 13:49:49 +00:00
rm_work.bbclass: Fix for files starting with -
This makes it possible to name files starting with a hyphen in the work directory. Without this change rm will fail due to an unexpected option being passed. (From OE-Core rev: eb65a5870a1f5c5a4fbce0df87a7dbfb38487dce) Signed-off-by: William A. Kennington III <wak@google.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 5f1a63e0de4921ef970114a16d0827fcddcdaa0e) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
53983505d7
commit
51fe6c9a07
@@ -73,7 +73,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 -f -- $i;
|
||||||
;;
|
;;
|
||||||
*_setscene*)
|
*_setscene*)
|
||||||
# Skip stamps which are already setscene versions
|
# Skip stamps which are already setscene versions
|
||||||
@@ -90,7 +90,7 @@ do_rm_work () {
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
rm -f $i
|
rm -f -- $i
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
@@ -100,9 +100,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 -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 -rf -- $dir
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user