diff options
| author | Renato Botelho <renato@netgate.com> | 2016-07-19 11:18:59 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-07-19 11:18:59 -0300 |
| commit | a3cba833a004cb7df22dfaec66a8512750285c79 (patch) | |
| tree | fd403044674716c1d9bd4ec20850674b1acff991 | |
| parent | d590613260d09fcfefb8ca894762888f3fc06def (diff) | |
| download | pfsense-a3cba833a004cb7df22dfaec66a8512750285c79.zip pfsense-a3cba833a004cb7df22dfaec66a8512750285c79.tar.gz | |
Welcome 2.3.2-RELEASE
| -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 |
4 files changed, 7 insertions, 6 deletions
diff --git a/src/etc/phpshellsessions/gitsync b/src/etc/phpshellsessions/gitsync index 19d18bb..eb20d63 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_2"; $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_2" => "2.3.2 stable branch", "build_commit" => "The commit originally used to build the image" ); diff --git a/src/etc/version b/src/etc/version index f8963ec..2aabee8 100644 --- a/src/etc/version +++ b/src/etc/version @@ -1 +1 @@ -2.3.2-DEVELOPMENT +2.3.2-RELEASE diff --git a/src/usr/local/www/system_update_settings.php b/src/usr/local/www/system_update_settings.php index e335ff9..ae79ecb 100644 --- a/src/usr/local/www/system_update_settings.php +++ b/src/usr/local/www/system_update_settings.php @@ -223,7 +223,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_2)' . '<br />Note: Sync will not be performed if a branch is not specified.', [$lastbranch]); $form->add($section); diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index 229617a..38d4aaf 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -144,7 +144,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_2"} export FREEBSD_PARENT_BRANCH=${FREEBSD_PARENT_BRANCH:-"releng/10.3"} export FREEBSD_SRC_DIR=${FREEBSD_SRC_DIR:-"${SCRATCHDIR}/FreeBSD-src"} @@ -272,7 +272,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_2"} unset _IS_RELEASE unset CORE_PKG_DATESTRING @@ -328,7 +328,7 @@ if [ -n "${_IS_RELEASE}" ]; 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_1"} + export PKG_REPO_BRANCH_RELEASE=${PKG_REPO_BRANCH_RELEASE:-"v2_3_2"} 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 |
