Move hardcoded paths out of the script files.
This commit is contained in:
parent
2a03a615d0
commit
f42a40df9a
|
@ -108,7 +108,7 @@ fi
|
||||||
|
|
||||||
source ${config_file}
|
source ${config_file}
|
||||||
|
|
||||||
TMPDIR=/release/tmp/catalyst-auto.${PID}
|
TMPDIR=${TMP_PATH}/catalyst-auto.${PID}
|
||||||
DATESTAMP=$(date +%Y%m%d)
|
DATESTAMP=$(date +%Y%m%d)
|
||||||
|
|
||||||
if [ ${verbose} = 1 ]; then
|
if [ ${verbose} = 1 ]; then
|
||||||
|
|
|
@ -1,9 +1,11 @@
|
||||||
# This is the config file for the catalyst-auto script. It should be pretty
|
# This is the config file for the catalyst-auto script. It should be pretty
|
||||||
# self-explanatory.
|
# self-explanatory.
|
||||||
|
|
||||||
BASE_DIR="/release"
|
|
||||||
REPO_DIR="${BASE_DIR}/releng"
|
|
||||||
ARCH="amd64"
|
ARCH="amd64"
|
||||||
|
TYPE="auto"
|
||||||
|
host=$(hostname)
|
||||||
|
|
||||||
|
source /etc/catalyst/release/build.env
|
||||||
|
|
||||||
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
|
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
|
||||||
|
|
||||||
|
@ -12,22 +14,15 @@ SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib"
|
||||||
SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
|
SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
|
||||||
SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
|
SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
|
||||||
SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec"
|
SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec"
|
||||||
|
|
||||||
SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec"
|
SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec"
|
||||||
|
|
||||||
SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
|
SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
|
||||||
|
SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
|
||||||
SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec"
|
SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec"
|
||||||
|
|
||||||
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
|
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() {
|
give_latest_from_dates() {
|
||||||
sed 's,-20,~20,g' | \
|
sed 's,-20,~20,g' | \
|
||||||
sort -k +1 -n -t '~' |\
|
sort -k +1 -n -t '~' |\
|
||||||
|
@ -41,8 +36,8 @@ give_latest_from_dates() {
|
||||||
pre_build() {
|
pre_build() {
|
||||||
pushd ${REPO_DIR}
|
pushd ${REPO_DIR}
|
||||||
git pull
|
git pull
|
||||||
|
|
||||||
popd
|
popd
|
||||||
|
|
||||||
# Symlink the latest stages3 to build from
|
# Symlink the latest stages3 to build from
|
||||||
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
|
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
|
||||||
pushd $d
|
pushd $d
|
||||||
|
|
|
@ -1,9 +1,11 @@
|
||||||
# This is the config file for the catalyst-auto script. It should be pretty
|
# This is the config file for the catalyst-auto script. It should be pretty
|
||||||
# self-explanatory.
|
# self-explanatory.
|
||||||
|
|
||||||
BASE_DIR="/release"
|
|
||||||
REPO_DIR="${BASE_DIR}/releng"
|
|
||||||
ARCH="x86"
|
ARCH="x86"
|
||||||
|
TYPE="auto"
|
||||||
|
host=$(hostname)
|
||||||
|
|
||||||
|
source /etc/catalyst/release/build.env
|
||||||
|
|
||||||
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
|
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_SPECS="stage1.spec stage2.spec stage3.spec"
|
||||||
SET_i486_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.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_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_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}
|
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() {
|
give_latest_from_dates() {
|
||||||
sed 's,-20,~20,g' | \
|
sed 's,-20,~20,g' | \
|
||||||
sort -k +1 -n -t '~' |\
|
sort -k +1 -n -t '~' |\
|
||||||
|
@ -40,8 +33,8 @@ give_latest_from_dates() {
|
||||||
pre_build() {
|
pre_build() {
|
||||||
pushd ${REPO_DIR}
|
pushd ${REPO_DIR}
|
||||||
git pull
|
git pull
|
||||||
|
|
||||||
popd
|
popd
|
||||||
|
|
||||||
# Symlink the latest stages3 to build from
|
# Symlink the latest stages3 to build from
|
||||||
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
|
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
|
||||||
pushd $d
|
pushd $d
|
||||||
|
|
Loading…
Reference in a new issue