CHANGELOG 2004-07-26

[hdw-linux/hdw-linux.git] / scripts / Create-Binary

diff --git a/scripts/Create-Binary b/scripts/Create-Binary
index 2272327..35d33a5 100755 (executable)
--- a/scripts/Create-Binary
+++ b/scripts/Create-Binary
@@ -42,13 +42,14 @@ if [ ! -z "$hdw_arch_opt" ]; then
 else
        bin_dir=${hdw_arch}-generic
 fi
+pkg_dir=`echo $package | 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,16 +58,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