X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=scripts%2FCreate-Binary;h=305925833817d59d13a49f8558516dd5d2c3f94a;hb=bee3e5ef448af92108624becd055b5d1f605a05d;hp=2272327886f1f7b979e51dbdb3520ede55a39d5a;hpb=2b6dfb448cf086bb899f505626c9e114e4971bd2;p=hdw-linux%2Fhdw-linux.git

diff --git a/scripts/Create-Binary b/scripts/Create-Binary
index 2272327..3059258 100755
--- a/scripts/Create-Binary
+++ b/scripts/Create-Binary
@@ -42,13 +42,17 @@ 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]%%'`
+pkg_dir=`echo $pkg_dir | sed "s%\(.*\)\.\(.*\)%\1%"`
+pkg_dir=`echo $pkg_dir | sed 's%-x%%'`
 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,16 +61,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?
 		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