Move hardcoded paths out of the script files.

tools/catalyst-auto-x86.conf

@@ -1,9 +1,11 @@
 # This is the config file for the catalyst-auto script. It should be pretty
 # self-explanatory.
 
-BASE_DIR="/release"
-REPO_DIR="${BASE_DIR}/releng"
 ARCH="x86"
+TYPE="auto"
+host=$(hostname)
+
+source /etc/catalyst/release/build.env
 
 SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
 
@@ -11,22 +13,13 @@ SETS="i486 i686 hardened"
 
 SET_i486_SPECS="stage1.spec stage2.spec stage3.spec"
 SET_i486_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-
 SET_i686_SPECS="i686/stage1.spec i686/stage2.spec i686/stage3.spec"
 
 SET_hardened_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
+SET_hardened_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
 
 KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
 
-EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
-EMAIL_FROM=catalyst@skimmer.gentoo.org
-EMAIL_SUBJECT_PREPEND="[${ARCH}-auto]"
-
-CATALYST_CONFIG=/etc/catalyst/release/${ARCH}-auto.conf
-
-BUILD_SRCDIR_BASE=${BASE_DIR}/buildroot/${ARCH}-dev/builds/
-BUILD_DESTDIR_BASE=/home/buildsync/builds/${ARCH}/
-
 give_latest_from_dates() {
 	sed 's,-20,~20,g' | \
 	sort -k +1 -n -t '~' |\
@@ -40,8 +33,8 @@ give_latest_from_dates() {
 pre_build() {
 	pushd ${REPO_DIR}
 	git pull
-
 	popd
+
 	# Symlink the latest stages3 to build from
 	for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
 		pushd $d