Browse Source

Clifford Wolf:


			
			
				rocklinux
			
			
		
Clifford Wolf 20 years ago
parent
commit
a45c236ebd
2 changed files with 4 additions and 4 deletions
  1. +3
    -3
      scripts/Build-Target
  2. +1
    -1
      scripts/functions

+ 3
- 3
scripts/Build-Target

@ -224,7 +224,7 @@ fi
sleep 1 sleep 1
done done
echo "All packages build." echo "All packages built."
sleep 2; rm -rf $qdir sleep 2; rm -rf $qdir
else else
if [ "$build_only_this_job" ] ; then if [ "$build_only_this_job" ] ; then
@ -254,7 +254,7 @@ fi
if [ $ROCKCFG_PKGFILE_VER = 1 ] ; then if [ $ROCKCFG_PKGFILE_VER = 1 ] ; then
while read p; do while read p; do
v=$( grep -h '^Package Name and Version:' build/$ROCKCFG_ID/var/adm/packages/$p:* \ v=$( grep -h '^Package Name and Version:' build/$ROCKCFG_ID/var/adm/packages/$p:* \
build/$ROCKCFG_ID/var/adm/packages/$p 2> /dev/null | cut -f6 -d' ' | head -n1 ) build/$ROCKCFG_ID/var/adm/packages/$p 2> /dev/null | cut -f6,7 -d' ' | tr ' ' - | head -n1 )
echo "$p-$v" echo "$p-$v"
done done
else else
@ -426,7 +426,7 @@ build_target_exit() {
echo_status "Killing liggering processes and removing parallel build queue." echo_status "Killing liggering processes and removing parallel build queue."
rm -rf $build_rock/queue rm -rf $build_rock/queue
fuser -k ${build_logs}/*.log fuser -k ${build_logs}/*.log &> /dev/null
sleep 2 sleep 2
echo_status "Umounting liggering mounts in build/$ROCKCFG_ID." echo_status "Umounting liggering mounts in build/$ROCKCFG_ID."

+ 1
- 1
scripts/functions

@ -524,7 +524,7 @@ create_package_db() {
if [ "$ROCKCFG_PKGFILE_VER" = 1 ] ; then if [ "$ROCKCFG_PKGFILE_VER" = 1 ] ; then
v=-$(grep '^Package Name and Version' \ v=-$(grep '^Package Name and Version' \
$1/packages/$pkg | cut -f6 -d' ') $1/packages/$pkg | cut -f6,7 -d' ' | tr ' ' -)
else else
v="" v=""
fi fi

|||||||
100:0
Loading…
Cancel
Save