From 0825aaea61984e2726cb1fee18bd3373ee846e7f Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Mon, 28 Sep 2015 08:56:38 -0300 Subject: Set FreeBSD src and ports repo to use github or git.pfmechanics.com based on local clone of pfSense repo --- tools/builder_defaults.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index fb15e93..c9dd3f2 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -134,7 +134,11 @@ else fi # This is used for using svn for retrieving src -export FREEBSD_REPO_BASE=${FREEBSD_REPO_BASE:-"git@git.pfmechanics.com:pfsense/freebsd-src.git"} +if git -C ${BUILDER_ROOT} remote -v | grep -q git.pfmechanics.com; then + export FREEBSD_REPO_BASE=${FREEBSD_REPO_BASE:-"git@git.pfmechanics.com:pfsense/freebsd-src.git"} +else + export FREEBSD_REPO_BASE=${FREEBSD_REPO_BASE:-"https://github.com/pfsense/freebsd-src.git"} +fi export FREEBSD_BRANCH=${FREEBSD_BRANCH:-"devel"} export FREEBSD_PARENT_BRANCH=${FREEBSD_PARENT_BRANCH:-"stable/10"} export FREEBSD_SRC_DIR=${FREEBSD_SRC_DIR:-"${SCRATCHDIR}/FreeBSD-src"} @@ -264,7 +268,11 @@ export ZFS_ROOT=${ZFS_ROOT:-"/poudriere"} export POUDRIERE_PORTS_NAME=${POUDRIERE_PORTS_NAME:-"${PRODUCT_NAME}_${GIT_REPO_BRANCH_OR_TAG}"} export POUDRIERE_BULK=${POUDRIERE_BULK:-"${BUILDER_TOOLS}/conf/pfPorts/poudriere_bulk"} -export POUDRIERE_PORTS_GIT_URL=${POUDRIERE_PORTS_GIT_URL:-"git@git.pfmechanics.com:pfsense/freebsd-ports.git"} +if git -C ${BUILDER_ROOT} remote -v | grep -q git.pfmechanics.com; then + export POUDRIERE_PORTS_GIT_URL=${POUDRIERE_PORTS_GIT_URL:-"git@git.pfmechanics.com:pfsense/freebsd-ports.git"} +else + export POUDRIERE_PORTS_GIT_URL=${POUDRIERE_PORTS_GIT_URL:-"https://github.com/pfsense/freebsd-ports.git"} +fi export POUDRIERE_PORTS_GIT_BRANCH=${POUDRIERE_PORTS_GIT_BRANCH:-"devel"} # Host to rsync pkg repos from poudriere -- cgit v1.1