diff options
| -rw-r--r-- | src/etc/phpshellsessions/gitsync | 3 | ||||
| -rw-r--r-- | src/etc/version | 2 | ||||
| -rw-r--r-- | src/usr/local/www/system_update_settings.php | 2 | ||||
| -rw-r--r-- | tools/builder_defaults.sh | 6 | ||||
| -rw-r--r-- | tools/templates/pkg_repos/pfSense-repo.conf | 4 |
5 files changed, 9 insertions, 8 deletions
diff --git a/src/etc/phpshellsessions/gitsync b/src/etc/phpshellsessions/gitsync index fd2b046..8b6750b 100644 --- a/src/etc/phpshellsessions/gitsync +++ b/src/etc/phpshellsessions/gitsync @@ -60,7 +60,7 @@ require_once("pfsense-utils.inc"); $GIT_PKG = "git"; // Either "git" or the full package URL $GIT_BIN= "/usr/local/bin/git"; $GIT_REPO = "git://github.com/pfsense/pfsense.git"; -$DEFAULT_BRANCH = "RELENG_2_3"; +$DEFAULT_BRANCH = "RELENG_2_3_4"; $CODIR = "/root/pfsense"; $GITSYNC_MERGE = "/root/.gitsync_merge"; @@ -68,6 +68,7 @@ $GITSYNC_MERGE = "/root/.gitsync_merge"; $branches = array( "master" => "2.4 development branch", "RELENG_2_3" => "2.3 development branch", + "RELENG_2_3_4" => "2.3.4 stable branch", "build_commit" => "The commit originally used to build the image" ); diff --git a/src/etc/version b/src/etc/version index 529d064..0aa25ee 100644 --- a/src/etc/version +++ b/src/etc/version @@ -1 +1 @@ -2.3.4-DEVELOPMENT +2.3.4-RELEASE diff --git a/src/usr/local/www/system_update_settings.php b/src/usr/local/www/system_update_settings.php index 2a27fae..e51ccea 100644 --- a/src/usr/local/www/system_update_settings.php +++ b/src/usr/local/www/system_update_settings.php @@ -254,7 +254,7 @@ if (file_exists("/usr/local/bin/git") && $g['platform'] == $g['product_name']) { 'Branch name', 'text', ($gitcfg['branch'] ? $gitcfg['branch'] : '') - ))->setHelp('The most recently used branch was "%s". (Usually the branch name is RELENG_2_3)' . + ))->setHelp('The most recently used branch was "%s". (Usually the branch name is RELENG_2_3_4)' . '<br />Note: Sync will not be performed if a branch is not specified.', [$lastbranch]); $group = new Form_Group('Sync options'); 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", |
