X-Git-Url: https://hackdaworld.org/gitweb/?p=hdw-linux%2Fhdw-linux.git;a=blobdiff_plain;f=scripts%2FCreate-Binary;h=52a091f49b1b0fac9adec1fc0842863dbf66da46;hp=14f9d4535d6710905eba23357c97080b87668a5e;hb=6208a5054375b18b532c13a8db055672756cf41f;hpb=6590bcd1cecd29b92b821a0663de431a01410786

diff --git a/scripts/Create-Binary b/scripts/Create-Binary
index 14f9d45..52a091f 100755
--- a/scripts/Create-Binary
+++ b/scripts/Create-Binary
@@ -42,13 +42,15 @@ if [ ! -z "$hdw_arch_opt" ]; then
 else
 	bin_dir=${hdw_arch}-generic
 fi
+pkg_dir=`echo $package | sed 's%-[0-9].%%'`
+pkg_dir=`echo $pkg_dir | sed 's%-[0-9]%%'`
 mkdir -p binaries/$bin_dir
 
 # single package
 if [  "$package" != "all" ] ; then
-if [ -d ./binaries/$bin_dir/${package} ] ; then
+if [ -d ./binaries/$bin_dir/${pkg_dir} ] ; then
 	echo "$package binary already exists, skipped"
-	echo "(remove ./binaries/$bin_dir/$package to recreate it)"
+	echo "(remove ./binaries/$bin_dir/${pkg_dir} to recreate it)"
 	exit 0
 else
 	# does it exist?
@@ -57,20 +59,16 @@ else
 		exit 0
 	else
 		echo "creating binary tarball of $package"
-		mkdir -p $hdw_home_dir/binaries/$bin_dir/$package &&
+		mkdir -p $hdw_home_dir/binaries/$bin_dir/${pkg_dir} &&
 		cd $hdw_build_dir &&
-		# which files do we need? - are we packaging linux?
-		if [ "$package" = "linux" ] ; then
-			fl_file="var/adm/flists/$package*"
-		else
-			fl_file="var/adm/flists/$package"
-		fi
+		# which files do we need?
+		fl_file="var/adm/flists/$package"
 		cat $fl_file | awk '{ print $2 }' | \
 		tar --no-recursion --use-compress-program=bzip2 \
-		-cf $hdw_home_dir/binaries/$bin_dir/$package/$tar_name.tar.bz2 \
+		-cf $hdw_home_dir/binaries/$bin_dir/${pkg_dir}/$tar_name.tar.bz2 \
 		-T -
 		cp $hdw_build_dir/var/adm/flists/$package \
-			$hdw_home_dir/binaries/$bin_dir/$package
+			$hdw_home_dir/binaries/$bin_dir/${pkg_dir}
 		cd $hdw_home_dir
 		echo "done"
 	fi
@@ -78,14 +76,16 @@ fi
 
 elif [ "$package" = "all" ] ; then
 
-((counter=1))
-for pkg in `ls -A $hdw_build_dir/var/adm/flists | grep -v '.stage1'`; do
-	./scripts/Create-Binary -package $pkg -root $hdw_build_dir
+((counter=0))
+for pkg in `ls -A $hdw_build_dir/var/adm/flists | grep -v '.stage'`; do
+	tar_name=`echo $pkg | awk -F- '{ print $1 }'`
+	./scripts/Create-Binary -package $pkg -root $hdw_build_dir \
+				-tar_name $tar_name
 	((counter+=1))
 done
 
 # add 00-dirtree, build in stage1
-./scripts/Create-Binary -package 00-dirtree.stage1 -tar-name 00-dirtree
+./scripts/Create-Binary -package 00-dirtree.stage0-0 -tar-name 00-dirtree
 ((counter+=1))
 
 echo "created $counter binaries, done"