X-Git-Url: https://hackdaworld.org/gitweb/?p=hdw-linux%2Fhdw-linux.git;a=blobdiff_plain;f=scripts%2FBuild-Distro;h=79f2cd336211013474158af8523117854433911f;hp=94b12eb347bf47b2e065dc23c11c46acfd70c648;hb=4dfe4bc90c6670e31d52449b3294467e879eda28;hpb=b756476d01e1ff39de954cc625e4e4744ff30841

diff --git a/scripts/Build-Distro b/scripts/Build-Distro
index 94b12eb..79f2cd3 100755
--- a/scripts/Build-Distro
+++ b/scripts/Build-Distro
@@ -6,7 +6,7 @@
 # 
 
 # define max priority
-max=20
+max=18
 stages="0 1"
 no_src_del=""
 
@@ -94,31 +94,31 @@ for stage in $stages; do
 	cat ./build_order_stage${stage} | grep -v '^#' | \
 			while read x pr dir package; do
 		# already build?
-		if [ ! -f $root/var/adm/logs/$stage-$pr-$package ]; then
+		if [ ! -f $root/var/adm/logs/$x-$pr-$package ]; then
 			echo
 			echo "building package `pkg_c $package`, stage $stage."
-			echo_w "log -> $root/var/adm/logs/$stage-$pr-$package"
+			echo_w "log -> $root/var/adm/logs/$x-$pr-$package"
 			echo_y "started, `date | awk '{ print $4 }'`"
 			b_append=""
 			[ ! -z "$no_src_del" ] && b_append="-no_src_del"
-			./scripts/Build -stage $stage -package $package \
+			./scripts/Build -stage $x -package $package \
 					-priority $pr -dir $dir $b_append > \
-				$root/var/adm/logs/$stage-$pr-$package.out 2>&1
+				$root/var/adm/logs/$x-$pr-$package.out 2>&1
 			if [ ! "$?" = "0" ]; then
 				echo_r "failed to build package $package!"
 				echo_r "aborted."
 				[ "$hdw_abort" = "1" ] && exit 1
 			else
-				mv $root/var/adm/logs/$stage-$pr-$package.out \
-				$root/var/adm/logs/$stage-$pr-$package
+				mv $root/var/adm/logs/$x-$pr-$package.out \
+				$root/var/adm/logs/$x-$pr-$package
 				echo_g "done, `date | awk '{ print $4 }'`"
 				# make binary tar package
 				if [ "$hdw_make_package" = "1" -a \
 				     "$hdw_status" -ge "2" ] ; then
 					echo -n "creating binary package ..."
-					if [ -d binaries/*/$package ] ; then
+					if [ -d binaries/{$hdw_arch}-${hdw_arch_opt}/$package ] ; then
 						echo -n " (deleting old first)"
-						rm -rf binaries/*/$package
+						rm -rf binaries/{$hdw_arch}-${hdw_arch_opt}/$package
 					fi
 					./scripts/Create-Binary \
 						-package $package-$pr \
@@ -130,7 +130,7 @@ for stage in $stages; do
 		else
 			echo
 			echo_w "$package already build in stage $stage, skipped"
-			echo_w "remove $root/var/adm/logs/$stage-$pr-$package"
+			echo_w "remove $root/var/adm/logs/$x-$pr-$package"
 			echo_w "if you want to rebuild it."
 		fi
 	done
@@ -248,7 +248,7 @@ EOT
 			exit 1
 		fi
 		# remove buildorder files
-		rm -f $root/usr/src/hdw-linux/build_order*
+		rm -f $root/chroot.sh
 		# last message
 		echo 
 		echo_w "you should now have build your hdw-linux distro"