diff options
author | Renato Botelho <renato@netgate.com> | 2016-04-06 17:48:40 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2016-04-06 17:48:40 -0300 |
commit | e7d4e8f4024f65692dc61863b9ae35fb7731d991 (patch) | |
tree | ddd126be50eef4fdb6d558c262d9adbf45b8412b | |
parent | e707bd5cca945e8cf26d3d5615c8cab97376855a (diff) | |
download | pfsense-e7d4e8f4024f65692dc61863b9ae35fb7731d991.zip pfsense-e7d4e8f4024f65692dc61863b9ae35fb7731d991.tar.gz |
Use correct branches for FreeBSD src and ports
-rw-r--r-- | tools/builder_defaults.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index 6f32a7c..76b75c6 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -142,7 +142,7 @@ GIT_REPO_BASE=$(git -C ${BUILDER_ROOT} config --get remote.origin.url | sed -e ' # This is used for using svn for retrieving src export FREEBSD_REPO_BASE=${FREEBSD_REPO_BASE:-"${GIT_REPO_BASE}/freebsd-src.git"} -export FREEBSD_BRANCH=${FREEBSD_BRANCH:-"RELENG_2_3"} +export FREEBSD_BRANCH=${FREEBSD_BRANCH:-"RELENG_2_3_0"} export FREEBSD_PARENT_BRANCH=${FREEBSD_PARENT_BRANCH:-"releng/10.3"} export FREEBSD_SRC_DIR=${FREEBSD_SRC_DIR:-"${SCRATCHDIR}/FreeBSD-src"} @@ -268,7 +268,7 @@ export POUDRIERE_PORTS_NAME=${POUDRIERE_PORTS_NAME:-"${PRODUCT_NAME}_${POUDRIERE export POUDRIERE_BULK=${POUDRIERE_BULK:-"${BUILDER_TOOLS}/conf/pfPorts/poudriere_bulk"} export POUDRIERE_PORTS_GIT_URL=${POUDRIERE_PORTS_GIT_URL:-"${GIT_REPO_BASE}/freebsd-ports.git"} -export POUDRIERE_PORTS_GIT_BRANCH=${POUDRIERE_PORTS_GIT_BRANCH:-"RELENG_2_3"} +export POUDRIERE_PORTS_GIT_BRANCH=${POUDRIERE_PORTS_GIT_BRANCH:-"RELENG_2_3_0"} # Host to rsync pkg repos from poudriere export PKG_RSYNC_USERNAME=${PKG_RSYNC_USERNAME:-"wwwsync"} |