sstate-cache-management.sh: fix it for downloaded file
cover sstate-cache-management.sh: fix it for downloaded file
The following changes since commit b4c5725af4cd85d5644f0373e2674e903c4eab2b:
yocto-bsp: add missing xserver-xf86-config .bbappend for qemu (2012-08-25 14:47:07 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib robert/sstate
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/sstate
Robert Yang (1):
sstate-cache-management.sh: fix it for downloaded file
scripts/sstate-cache-management.sh | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)
Signature · 1 line
1.7.11.2
PATCH 1/1 sstate-cache-management.sh: fix it for downloaded file
Fix it for the downloaded sstate cache file
* The downloaded sstate cache file is in SSTATE_DIR, and there is a symlink points to it, the sstate cache file should not be removed if the corresponding symlink is kept, it would be removed when the symlink is removed (with -L option).
* Fix a comment line.
[YOCTO #2897]
--- scripts/sstate-cache-management.sh | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)
scripts/sstate-cache-management.sh +19 -1
@@ -211,8 +211,25 @@ remove_duplicated () { for arch in $ava_archs; do grep -h "/$fn-$arch-" $list_suffix >>$fn_tmp done - # Use the access time, also delete the .siginfo file + # Use the modification time to_del=$(ls -t $(cat $fn_tmp) | sed -n '1!p') + # The sstate file which is downloaded from the SSTATE_MIRROR is + # put in SSTATE_DIR, and there is a symlink in SSTATE_DIR/??/ to + # it, so filter it out from the remove list if it should not be + # removed. + to_keep=$(ls -t $(cat $fn_tmp) | sed -n '1p') + for k in $to_keep; do + if [ -L "$k" ]; then + # The symlink's destination + k_dest="`readlink -e $k`" + # Maybe it is the one in cache_dir + k_maybe="$cache_dir/${k##/*/}" + # Remove it from the remove list if they are the same. + if [ "$k_dest" = "$k_maybe" ]; then + to_del="`echo $to_del | sed 's#'\"$k_maybe\"'##g'`" + fi + fi + done rm -f $fn_tmp gen_rmlist $rm_list "$to_del" done
@@ -221,6 +238,7 @@ remove_duplicated () { let total_deleted=$total_deleted+$deleted done rm -f $list_suffix + rm -f $sstate_list if [ $total_deleted -gt 0 ]; then read_confirm if [ "$confirm" = "y" -o "$confirm" = "Y" ]; then
Signature · 1 line
1.7.11.2
Saul Wold
AppliedQuoted 6 lines · Robert Yang
The following changes since commit
b4c5725af4cd85d5644f0373e2674e903c4eab2b:yocto-bsp: add missing xserver-xf86-config .bbappend for qemu (2012-08-25 14:47:07 +0100)are available in the git repository at:
Quoted 9 lines
git://git.pokylinux.org/poky-contribrobert/sstate
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/sstateRobert Yang (1):
sstate-cache-management.sh: fix it for downloaded filescripts/sstate-cache-management.sh | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)
Merged into OE-Core
Thanks
Sau!