X-Git-Url: https://hackdaworld.org/gitweb/?p=hdw-linux%2Fhdw-linux.git;a=blobdiff_plain;f=scripts%2FBuild-Distro;h=0f0f62f72d3c124b949890db1e65ac591602d9f0;hp=e1f1dd181e1c2b079bb9d0e786cbd90031b373e5;hb=504579d0d381b02fc33fe1c696d64f96135a15a8;hpb=6ae193981fcc05dcc495b4bde92cb8fd290ee4dd

diff --git a/scripts/Build-Distro b/scripts/Build-Distro
index e1f1dd1..0f0f62f 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=""
 
@@ -80,42 +80,46 @@ for stage in $stages; do
 		[ ! -d ${hdw_build_dir}/var/adm/deps ] && \
 			mkdir -p ${hdw_build_dir}/var/adm/deps/{run,build}
 		# symlinking the stage 0/1 prefix to hostsystem root
-		if [ -d /$s1_prefix ]; then
-			if [ ! -L /$s1_prefix ]; then
+		if [ -d /$tc_name ]; then
+			if [ ! -L /$tc_name ]; then
 				echo_r "WARNING: "
-				echo_w "move /$s1_prefix to /${s1_prefix}_old"
-				mv /$s1_prefix /${s1_prefix}_old
+				echo_w "move /$tc_name to /${tc_name}_old"
+				mv /$tc_name /${tc_name}_old
 			fi
 		fi
-		ln -sf $hdw_build_dir/$s1_prefix /
+		ln -sf $hdw_build_dir/$tc_name /
 	fi
 
 	# build according buildorder
 	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
+				     "$stage" -ge "2" ] ; then
 					echo -n "creating binary package ..."
+					if [ -d binaries/{$hdw_arch}-${hdw_arch_opt}/$package ] ; then
+						echo -n " (deleting old first)"
+						rm -rf binaries/{$hdw_arch}-${hdw_arch_opt}/$package
+					fi
 					./scripts/Create-Binary \
 						-package $package-$pr \
 						-tar-name $package \
@@ -126,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
@@ -195,7 +199,7 @@ for stage in $stages; do
 		echo_c "preparing chroot commands ..."
 		cat > $root/chroot.sh <<- EOT
 # PATH                          
-export PATH="\$PATH:/${s1_prefix}/bin:/${s1_prefix}/sbin"
+export PATH="\$PATH:/${tc_name}/bin:/${tc_name}/sbin"
 # create essential device nodes
 mknod -m 600 /dev/console c 5 1
 mknod -m 666 /dev/null c 1 3
@@ -236,15 +240,15 @@ EOT
 		mount -t devpts devpts $root/dev/pts
 		echo_w "entering chroot and start building now ..."
 		echo
-		chroot $hdw_build_dir /${s1_prefix}/bin/env PS1='\u@\w\$ ' \
+		chroot $hdw_build_dir /${tc_name}/bin/env PS1='\u@\w\$ ' \
 			PATH="/bin:/usr/bin:/sbin:/usr/sbin" HOME=/root \
-			/${s1_prefix}/bin/bash --login +h /chroot.sh
+			/${tc_name}/bin/bash --login +h /chroot.sh
 		if [ ! "$?" = "0" ]; then
 			echo_r "something failed in the chroot, aborting."
 			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"