diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2016-07-01 17:41:42 +0100 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2016-07-01 18:09:12 +0100 |
| commit | 2590ae3ac9c03ac30372578a84b1abd27ba66269 (patch) | |
| tree | a8b9866a48071949d6453db63e9a79dd6c6916cb /MakeRelease.job | |
| parent | 5f97f95b6ddd8e5dc1d5e6f94e1492b78cf3389c (diff) | |
scripts/MakeRelease.job: Convert --extra option to --toolchainconfig
Change-Id: If71a979854d12cb4422505710bf9d340d6974ffa
Diffstat (limited to 'MakeRelease.job')
| -rwxr-xr-x | MakeRelease.job | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/MakeRelease.job b/MakeRelease.job index e8c58db8..6d2ae809 100755 --- a/MakeRelease.job +++ b/MakeRelease.job @@ -14,9 +14,10 @@ ref="snapshots-ref" nocheck="no" fileserver="148.251.136.42" extra= +toolchain_config="" user_workspace="${WORKSPACE:-/home/${USER:-buildslave}/workspace}" -OPTS="`getopt -o e:r:t:f:d:bs:w:nh -l target:,ref:,date:,fileserver:,tarbin:,tarsrc:,workspace:,extra:,help`" +OPTS="`getopt -o r:t:f:d:bs:w:nh -l target:,ref:,date:,fileserver:,tarbin:,tarsrc:,workspace:,toolchainconfig:,help`" while test $# -gt 0; do echo 1 = "$1" case $1 in @@ -26,7 +27,7 @@ while test $# -gt 0; do -t|--target) target=$2 ;; -d|--date) date=$2 ;; -r|--ref) ref=$2 ;; - -e|--extra) extra=$2 ;; + --toolchainconfig) toolchain_config=$2 ;; -f|--fileserver) fileserver=$2 ;; -n|--nocheck) nocheck=yes ;; -h|--help) usage ;; @@ -62,8 +63,11 @@ fi # By default, always update all sources update="" -if test x"${extra}" != x; then - extra="--extraconfigdir ${extra}" +if test x"${toolchain_config}" != x"" \ + -a x"${toolchain_config}" != x"default"; then + # Note, we need to specify ../config/FOO because the build is done + # inside _build directory 1 level up from ABE's top. + extra="${extra} --extraconfigdir ../config/${toolchain_config}" fi if test x"${runtests}" = xtrue; then |