diff options
author | Renato Botelho <renato@netgate.com> | 2015-09-07 11:28:29 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2015-09-07 11:28:29 -0300 |
commit | fb1922270b62bc032acb47d91e78e8d45137a9c1 (patch) | |
tree | 2bc15f1c67947749a06f4dce787c51432418e87e /tools | |
parent | c96b22422ca534ca1cf0ac075a1bab4e26b81d9b (diff) | |
download | pfsense-fb1922270b62bc032acb47d91e78e8d45137a9c1.zip pfsense-fb1922270b62bc032acb47d91e78e8d45137a9c1.tar.gz |
Allow to use -a to select archs on all poudriere commands
Diffstat (limited to 'tools')
-rw-r--r-- | tools/builder_common.sh | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index f1f6a76..c47f358 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -1661,6 +1661,24 @@ poudriere_possible_archs() { fi fi + if [ -n "${ARCH_LIST}" ]; then + local _found=0 + for _desired_arch in "${ARCH_LIST}"; do + _found=0 + for _possible_arch in "${_archs}"; do + if [ "${_desired_arch}" = "${_possible_arch}" ]; then + _found=1 + break + fi + done + if [ ${_found} -eq 0 ]; then + echo ">>> ERROR: Impossible to build for arch: ${_desired_arch}" + print_error_pfS + fi + done + _archs="${ARCH_LIST}" + fi + echo ${_archs} } @@ -1824,20 +1842,6 @@ poudriere_update_jails() { local native_xtools="" for jail_arch in ${_archs}; do - local _run=0 - if [ -n "${ARCH_LIST}" ]; then - for _arch in ${ARCH_LIST}; do - if [ "${jail_arch##*.}" = "${_arch}" ]; then - _run=1 - fi - done - else - _run=1 - fi - - [ ${_run} -eq 0 ] \ - && continue - jail_name=$(poudriere_jail_name ${jail_arch}) if ! poudriere jail -i -j "${jail_name}" >/dev/null 2>&1; then |