diff options
| author | Renato Botelho <renato@netgate.com> | 2015-08-25 09:46:46 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-08-25 14:49:55 -0300 |
| commit | edef37f6da3228fccad951aa146de11c3b2bd278 (patch) | |
| tree | 3a67dfb30007cec76f16ad25d0b5aecb9fbf22ca /tools | |
| parent | f6eb412c84ffa3d75252b5a49a30a5f10847af9c (diff) | |
| download | pfsense-edef37f6da3228fccad951aa146de11c3b2bd278.zip pfsense-edef37f6da3228fccad951aa146de11c3b2bd278.tar.gz | |
Do not try to get make.conf from other branch
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/builder_common.sh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 2469ee7..4df0080 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -1931,14 +1931,10 @@ poudriere_bulk() { poudriere_create_ports_tree - local CUR_BRANCH=$(cd ${BUILDER_ROOT} && git branch | grep '^\*' | cut -d' ' -f2) - [ -d /usr/local/etc/poudriere.d ] || \ mkdir -p /usr/local/etc/poudriere.d - if [ "${CUR_BRANCH}" != "${GIT_REPO_BRANCH_OR_TAG}" ] && git show "${GIT_REPO_BRANCH_OR_TAG}:builder_scripts/conf/pfPorts/make.conf" >/dev/null 2>&1; then - git show "origin/${GIT_REPO_BRANCH_OR_TAG}:builder_scripts/conf/pfPorts/make.conf" > /usr/local/etc/poudriere.d/${POUDRIERE_PORTS_NAME}-make.conf - elif [ -f "${BUILDER_TOOLS}/conf/pfPorts/make.conf" ]; then + if [ -f "${BUILDER_TOOLS}/conf/pfPorts/make.conf" ]; then cp -f "${BUILDER_TOOLS}/conf/pfPorts/make.conf" /usr/local/etc/poudriere.d/${POUDRIERE_PORTS_NAME}-make.conf fi |
