--- hasher-1.0.13/functions.in	2005-03-27 23:55:02 +0900
+++ hasher-1.0.13/functions.in	2005-04-29 21:39:22 +0900
@@ -77,6 +77,10 @@ 
 def_target=@deftarget@
 target=
 
+# repo directory.
+def_repo=repo
+repo=
+
 # RPM --excludedocs
 exclude_docs=
 
@@ -313,14 +317,14 @@ 
 # assumed: cwd == workdir
 make_repo()
 {
-	mkdir -p $verbose -- repo/{{SRPMS,${target:-$def_target}/RPMS}.hasher,${target:-$def_target}/base}
+	mkdir -p $verbose -- ${repo:-$def_repo}/{{SRPMS,${target:-$def_target}/RPMS}.hasher,${target:-$def_target}/base}
 }
 
 # assumed: cwd == workdir, defined prog_genbasedir
 update_repo()
 {
 	[ -z "$no_stuff" ] || return 0
-	"$prog_genbasedir" --topdir=repo --no-oldhashfile --bz2only --mapi ${target:-$def_target} hasher &&
+	"$prog_genbasedir" --topdir=${repo:-$def_repo} --no-oldhashfile --bz2only --mapi ${target:-$def_target} hasher &&
 		Verbose "updated hasher repository indices." ||
 		Fatal "failed to update hasher repository indices."
 }
--- hasher-1.0.13/hsh	2005-04-10 23:58:25 +0900
+++ hasher-1.0.13/hsh	2005-04-29 21:38:50 +0900
@@ -56,6 +56,7 @@ 
   --query-req-prog=FILE             program to run to query for requirements
                                     instead of autogenerated script;
   --target=ARCH                     target architecture;
+  --repo=DIR                        repository directory;
   --number=NUMBER                   subconfig identifier;
   --nprocs=NUMBER                   number of CPUs to use;
   --mountpoints=LIST                comma-separated list of known mount points;
@@ -77,7 +78,7 @@ 
 	[ -n "$1" ] && exit "$1" || exit
 }
 
-TEMP=`getopt -n $PROG -o q,v,V,h -l with-stuff,without-stuff,no-stuff,no-cache,no-contents-indices,excludedocs,repackage-source,initroot-only,no-sisyphus-check::,no-sisyphus-check-in::,no-sisyphus-check-out::,rebuild-prog:,query-req-prog:,target:,number:,nprocs:,mountpoints:,hasher-priv-dir:,install-langs:,build-args:,contents-index-all:,contents-index-bin:,pkg-init-list:,pkg-build-list:,apt-config:,apt-prefix:,quiet,verbose,help,version -- "$@"` || Usage
+TEMP=`getopt -n $PROG -o q,v,V,h -l with-stuff,without-stuff,no-stuff,no-cache,no-contents-indices,excludedocs,repackage-source,initroot-only,no-sisyphus-check::,no-sisyphus-check-in::,no-sisyphus-check-out::,rebuild-prog:,query-req-prog:,target:,repo:,number:,nprocs:,mountpoints:,hasher-priv-dir:,install-langs:,build-args:,contents-index-all:,contents-index-bin:,pkg-init-list:,pkg-build-list:,apt-config:,apt-prefix:,quiet,verbose,help,version -- "$@"` || Usage
 eval set -- "$TEMP"
 
 no_cache=
@@ -128,6 +129,8 @@ 
 			[ -z "${target##[A-Za-z]*}" ] ||
 				Fatal "--target: $target: invalid architecture."
 			;;
+		--repo) shift; repo="$1"
+			;;
 		--build-args) shift; rpmargs="$1"
 			;;
 		--number) shift; number="${1##-}"
@@ -229,6 +232,7 @@ 
 	rm -rf aptbox
 	$hasher_dir/mkaptbox "$workdir" \
 		${target:+--target="$target"} \
+		${repo:+--repo="$repo"} \
 		${apt_config:+--apt-config="$apt_config"} \
 		${quiet:+$quiet} \
 		${verbose:+$verbose} \
@@ -263,6 +267,7 @@ 
 	[ -n "$f" ] || return 0
 	$hasher_dir/rebuild "$workdir" \
 		${target:+--target="$target"} \
+		${repo:+--repo="$repo"} \
 		${hasher_priv_dir:+--hasher-priv-dir="$hasher_priv_dir"} \
 		${known_mountpoints:+--mountpoints="$known_mountpoints"} \
 		${quiet:+$quiet} \
--- hasher-1.0.13/mkaptbox	2005-03-27 23:55:02 +0900
+++ hasher-1.0.13/mkaptbox	2005-04-29 21:32:38 +0900
@@ -41,6 +41,7 @@ 
   --with-stuff              configure sources.list for the work repository;
   --without-stuff           do not configure sources.list for the work repository;
   --target=ARCH             target architecture of the work repository;
+  --repo=DIR                path to work repository directory;
   --apt-config=FILE         path to custom apt.conf file;
   --apt-prefix=DIR          path to apt directory prefix (e.g. /usr);
   --no-update               do not run "apt-get update" after creation;
@@ -57,7 +58,7 @@ 
 	[ -n "$1" ] && exit "$1" || exit
 }
 
-TEMP=`getopt -n $PROG -o f,u,q,v,V,h -l with-stuff,without-stuff,no-stuff,target:,apt-config:,apt-prefix:,no-update,update,force,quiet,verbose,help,version -- "$@"` || Usage
+TEMP=`getopt -n $PROG -o f,u,q,v,V,h -l with-stuff,without-stuff,no-stuff,target:,repo:,apt-config:,apt-prefix:,no-update,update,force,quiet,verbose,help,version -- "$@"` || Usage
 eval set -- "$TEMP"
 
 force=
@@ -73,6 +74,8 @@ 
 			[ -z "${target##[A-Za-z]*}" ] ||
 				Fatal "--target: $target: invalid architecture."
 			;;
+		--repo) shift; repo="$1"
+			;;
 		--apt-config)
 			apt_config="$(opt_check_read "$1" "$2")"
 			shift
@@ -159,7 +162,7 @@ 
 
 target_config="./etc/apt/sources.list"
 cat >"$target_config" <<__EOF__
-${no_stuff:+#}rpm file:$workdir/repo ${target:-$def_target} hasher
+${no_stuff:+#}rpm file:$workdir/${repo:-$def_repo} ${target:-$def_target} hasher
 $(grep '^[^#]' "$sl_value")
 __EOF__
 Verbose "created APT source list file \`$target_config'"
--- hasher-1.0.13/rebuild	2005-04-11 01:46:31 +0900
+++ hasher-1.0.13/rebuild	2005-04-29 21:32:48 +0900
@@ -47,6 +47,7 @@ 
   --rebuild-prog=FILE               program to run for rebuild instead of autogenerated script;
   --query-req-prog=FILE             program to run to query for requirements instead of autogenerated script;
   --target=ARCH                     target architecture;
+  --repo=DIR                        repository directory;
   --args=ARGS                       extra arguments for rpmbuild;
   --mountpoints=LIST                comma-separated list of known mount points;
   --nodeps                          ignore package dependencies (dangerous);
@@ -60,7 +61,7 @@ 
 	[ -n "$1" ] && exit "$1" || exit
 }
 
-TEMP=`getopt -n $PROG -o q,v,V,h -l with-stuff,without-stuff,no-stuff,excludedocs,no-sisyphus-check::,no-sisyphus-check-in::,no-sisyphus-check-out::,rebuild-prog:,query-req-prog:,target:,args:,mountpoints:,nodeps,number:,hasher-priv-dir:,quiet,verbose,help,version -- "$@"` || Usage
+TEMP=`getopt -n $PROG -o q,v,V,h -l with-stuff,without-stuff,no-stuff,excludedocs,no-sisyphus-check::,no-sisyphus-check-in::,no-sisyphus-check-out::,rebuild-prog:,query-req-prog:,target:,repo:,args:,mountpoints:,nodeps,number:,hasher-priv-dir:,quiet,verbose,help,version -- "$@"` || Usage
 eval set -- "$TEMP"
 
 nodeps=
@@ -96,6 +97,8 @@ 
 			[ -z "${target##[A-Za-z]*}" ] ||
 				Fatal "--target: $target: invalid architecture."
 			;;
+		--repo) shift; repo="$1"
+			;;
 		--args) shift; rpmargs="$1"
 			;;
 		--mountpoints) shift; known_mountpoints="$1"
@@ -311,18 +314,18 @@ 
 case `find chroot/.out/ -mindepth 1 -maxdepth 1 -type f -name \*.src.rpm |grep -c '\.src\.rpm$'` in
 	0)
 		find chroot/.in/ -mindepth 1 -maxdepth 1 -type f -name \*.src.rpm -print0 |
-			xargs -r0 mv --reply=yes $verbose --target-directory=repo/SRPMS.hasher/ --
+			xargs -r0 mv --reply=yes $verbose --target-directory=${repo:-$def_repo}/SRPMS.hasher/ --
 		;;
 	1)
 		find chroot/.out/ -mindepth 1 -maxdepth 1 -type f -name \*.src.rpm -print0 |
-			xargs -r0 mv --reply=yes $verbose --target-directory=repo/SRPMS.hasher/ --
+			xargs -r0 mv --reply=yes $verbose --target-directory=${repo:-$def_repo}/SRPMS.hasher/ --
 		;;
 	*)
 		Fatal "too many src.rpm files written."
 		;;
 esac
 find chroot/.out/ -mindepth 1 -maxdepth 1 -type f -name \*.rpm -print0 |
-	xargs -r0 mv --reply=yes $verbose --target-directory=repo/"${target:-$def_target}"/RPMS.hasher/ --
+	xargs -r0 mv --reply=yes $verbose --target-directory=${repo:-$def_repo}/"${target:-$def_target}"/RPMS.hasher/ --
 
 purge_chroot_in
 purge_chroot_out