diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/builder_defaults.sh | 6 | ||||
| -rw-r--r-- | tools/templates/pkg_repos/pfSense-repo.conf | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index 8ab6b6c..477d213 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -145,7 +145,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_4"} export FREEBSD_PARENT_BRANCH=${FREEBSD_PARENT_BRANCH:-"releng/10.3"} export FREEBSD_SRC_DIR=${FREEBSD_SRC_DIR:-"${SCRATCHDIR}/FreeBSD-src"} @@ -280,7 +280,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_4"} unset _IS_RELEASE unset _IS_RC @@ -338,7 +338,7 @@ if [ -n "${_IS_RELEASE}" -o -n "${_IS_RC}" ]; then export PKG_REPO_BRANCH_DEVEL=${PKG_REPO_BRANCH_DEVEL:-"v2_3"} export PKG_REPO_BRANCH_STAGING=${PKG_REPO_BRANCH_STAGING:-${PKG_REPO_BRANCH_RELEASE}} else - export PKG_REPO_BRANCH_RELEASE=${PKG_REPO_BRANCH_RELEASE:-"v2_3_3"} + export PKG_REPO_BRANCH_RELEASE=${PKG_REPO_BRANCH_RELEASE:-"v2_3_4"} export PKG_REPO_BRANCH_DEVEL=${PKG_REPO_BRANCH_DEVEL:-${POUDRIERE_BRANCH}} export PKG_REPO_BRANCH_STAGING=${PKG_REPO_BRANCH_STAGING:-${PKG_REPO_BRANCH_DEVEL}} fi diff --git a/tools/templates/pkg_repos/pfSense-repo.conf b/tools/templates/pkg_repos/pfSense-repo.conf index dba6a6a..6cde860 100644 --- a/tools/templates/pkg_repos/pfSense-repo.conf +++ b/tools/templates/pkg_repos/pfSense-repo.conf @@ -1,7 +1,7 @@ FreeBSD: { enabled: no } %%PRODUCT_NAME%%-core: { - url: "%%PKG_REPO_SERVER_DEVEL%%/%%PRODUCT_NAME%%_%%PKG_REPO_BRANCH_DEVEL%%_%%ARCH%%-core", + url: "%%PKG_REPO_SERVER_RELEASE%%/%%PRODUCT_NAME%%_%%PKG_REPO_BRANCH_RELEASE%%_%%ARCH%%-core", mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/local/share/%%PRODUCT_NAME%%/keys/pkg", @@ -9,7 +9,7 @@ FreeBSD: { enabled: no } } %%PRODUCT_NAME%%: { - url: "%%PKG_REPO_SERVER_DEVEL%%/%%PRODUCT_NAME%%_%%PKG_REPO_BRANCH_DEVEL%%_%%ARCH%%-%%PRODUCT_NAME%%_%%PKG_REPO_BRANCH_DEVEL%%", + url: "%%PKG_REPO_SERVER_RELEASE%%/%%PRODUCT_NAME%%_%%PKG_REPO_BRANCH_RELEASE%%_%%ARCH%%-%%PRODUCT_NAME%%_%%PKG_REPO_BRANCH_RELEASE%%", mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/local/share/%%PRODUCT_NAME%%/keys/pkg", |
