Browse Source

Tobias Hintze <th@rocklinux.org>:


			
			
				rocklinux
			
			
		
Tobias Hintze 19 years ago
parent
commit
d34fad2fb9
2 changed files with 8 additions and 8 deletions
  1. +3
    -3
      scripts/Build-Target
  2. +5
    -5
      scripts/Cleanup

+ 3
- 3
scripts/Build-Target

@ -258,7 +258,7 @@ fi
fi fi
local pkglst=`mktemp` errors=0; rm -f src/invalid-files.lst local pkglst=`mktemp` errors=0; rm -f src/invalid-files.lst
echo_header "Searching for old liggering files ..."
echo_header "Searching for old lingering files ..."
grep "^X" config/$config/packages | cut -d' ' -f5 | sed 's,.*=,,' | grep "^X" config/$config/packages | cut -d' ' -f5 | sed 's,.*=,,' |
if [ $ROCKCFG_PKGFILE_VER = 1 ] ; then if [ $ROCKCFG_PKGFILE_VER = 1 ] ; then
while read p; do while read p; do
@ -431,12 +431,12 @@ build_target_exit() {
echo_header "Running Build-Target cleanup procedure" echo_header "Running Build-Target cleanup procedure"
echo_status "Killing liggering processes and removing parallel build queue."
echo_status "Killing lingering processes and removing parallel build queue."
rm -rf $build_rock/queue rm -rf $build_rock/queue
fuser -k ${build_logs}/*.log &> /dev/null fuser -k ${build_logs}/*.log &> /dev/null
sleep 2 sleep 2
echo_status "Umounting liggering mounts in build/$ROCKCFG_ID."
echo_status "Umounting lingering mounts in build/$ROCKCFG_ID."
umount -d -f $build_rock/{loop,config,download} 2> /dev/null umount -d -f $build_rock/{loop,config,download} 2> /dev/null
umount -d -f -l $build_rock/{loop,config,download} 2> /dev/null umount -d -f -l $build_rock/{loop,config,download} 2> /dev/null
umount -d -f $build_root/proc 2> /dev/null umount -d -f $build_root/proc 2> /dev/null

+ 5
- 5
scripts/Cleanup

@ -43,10 +43,10 @@ while [ "$1" ] ; do
echo echo
echo " Cleanup the build environment, deleting the directories src, src.*," echo " Cleanup the build environment, deleting the directories src, src.*,"
echo " build/*/ROCK/src.* and various temporary/backup files." echo " build/*/ROCK/src.* and various temporary/backup files."
echo " Also check for old liggering files."
echo " Also check for old lingering files."
echo " Without options, remove src and all src.* and build/*/ROCK/src.*" echo " Without options, remove src and all src.* and build/*/ROCK/src.*"
echo " directories, and all temporary/backup files, and perform checks for old" echo " directories, and all temporary/backup files, and perform checks for old"
echo " liggering files."
echo " lingering files."
echo " If directories are given, delete only them. Directories used by ROCK scripts" echo " If directories are given, delete only them. Directories used by ROCK scripts"
echo " at the moment are recognized and not deleted." echo " at the moment are recognized and not deleted."
echo echo
@ -54,10 +54,10 @@ while [ "$1" ] ; do
echo " e.g. build/desktop-*" echo " e.g. build/desktop-*"
echo echo
echo " -nocheck don't delete temporary/backup files and don't" echo " -nocheck don't delete temporary/backup files and don't"
echo " check for old liggering files"
echo " check for old lingering files"
echo echo
echo " -umount don't remove anything, just umount all the" echo " -umount don't remove anything, just umount all the"
echo " liggering mounts, implies '-full' and '-nocheck'"
echo " lingering mounts, implies '-full' and '-nocheck'"
echo echo
exit 1 ;; exit 1 ;;
*) *)
@ -136,7 +136,7 @@ bash scripts/xfind.sh Documentation/. architecture/. misc/. \
package/. scripts/. target/. -type f \( -name '*~' -o \ package/. scripts/. target/. -type f \( -name '*~' -o \
-name 'a.out' -o -name 'core.*' -o -name 'core' \) | xargs rm -vf -name 'a.out' -o -name 'core.*' -o -name 'core' \) | xargs rm -vf
# Print warnings for 'liggering' files
# Print warnings for 'lingering' files
# #
bash scripts/xfind.sh Documentation/. architecture/. misc/. \ bash scripts/xfind.sh Documentation/. architecture/. misc/. \
package/. scripts/. target/. \ package/. scripts/. target/. \

Loading…
Cancel
Save