diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2016-05-19 22:16:14 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2016-05-19 22:16:14 -0400 |
| commit | 170331ecea5c8de1c49d8bb4818fb28c5b5f4662 (patch) | |
| tree | b7cb9718a5e25919515de7842a6ba21e2fafaed8 | |
| parent | catalyst-auto: try to fix syntax error in previous commits (diff) | |
| download | releng-170331ecea5c8de1c49d8bb4818fb28c5b5f4662.tar.gz releng-170331ecea5c8de1c49d8bb4818fb28c5b5f4662.tar.bz2 releng-170331ecea5c8de1c49d8bb4818fb28c5b5f4662.zip | |
catalyst-auto: automatically calculate REPO_DIR
Rather than hardcode it to a path that works on only a few systems,
switch it to the dynamic calculation like we use for GITDIR.
| -rw-r--r-- | config/build.env | 1 | ||||
| -rwxr-xr-x | tools/catalyst-auto | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/build.env b/config/build.env index 72c68dc2..2fc44f64 100644 --- a/config/build.env +++ b/config/build.env @@ -1,5 +1,4 @@ BASE_DIR="/release" -REPO_DIR="/release/releng" TMP_PATH="/release/tmp/run" BUILD_SRCDIR_BASE=${BASE_DIR}/buildroot/${ARCH}-dev/builds/ BUILD_DESTDIR_BASE=${BASE_DIR}/weekly/builds/${ARCH}/ diff --git a/tools/catalyst-auto b/tools/catalyst-auto index 51e0c16a..b933aa69 100755 --- a/tools/catalyst-auto +++ b/tools/catalyst-auto @@ -159,8 +159,9 @@ if [[ -n ${lock_file} ]]; then fi fi -# Probe the default gitdir from this script name. -GITDIR=$(dirname "$(dirname "$(realpath "$0")")") +# Probe the default source dir from this script name. +REPO_DIR=$(dirname "$(dirname "$(realpath "$0")")") +GITDIR=${REPO_DIR} # Set up defaults that config files can override if they want. SUBARCH=$(uname -m) |