diff options
| author | Renato Botelho <renato@netgate.com> | 2016-05-16 14:33:01 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-05-16 14:33:01 -0300 |
| commit | f3de6f5575e53f8114d5a117d23713b390e50cce (patch) | |
| tree | c156fce3aebc74ffb74f47af7f39ecf75045367d | |
| parent | e362ec5bced3a97a0732577b3debe355158eb85d (diff) | |
| download | pfsense-f3de6f5575e53f8114d5a117d23713b390e50cce.zip pfsense-f3de6f5575e53f8114d5a117d23713b390e50cce.tar.gz | |
Welcome 2.3.1-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 | 4 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/etc/phpshellsessions/gitsync b/src/etc/phpshellsessions/gitsync index e24ed3a..523cfa3 100644 --- a/src/etc/phpshellsessions/gitsync +++ b/src/etc/phpshellsessions/gitsync @@ -14,7 +14,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_1"; $CODIR = "/root/pfsense"; $GITSYNC_MERGE = "/root/.gitsync_merge"; @@ -22,6 +22,7 @@ $GITSYNC_MERGE = "/root/.gitsync_merge"; $branches = array( "master" => "2.4 development branch", "RELENG_2_3" => "2.3 development branch", + "RELENG_2_3_1" => "2.3.1 stable branch", "build_commit" => "The commit originally used to build the image" ); diff --git a/src/etc/version b/src/etc/version index 9444f66..8be3384 100644 --- a/src/etc/version +++ b/src/etc/version @@ -1 +1 @@ -2.3.1-DEVELOPMENT +2.3.1-RELEASE diff --git a/src/usr/local/www/system_update_settings.php b/src/usr/local/www/system_update_settings.php index be72d41..fef1fb4 100644 --- a/src/usr/local/www/system_update_settings.php +++ b/src/usr/local/www/system_update_settings.php @@ -225,7 +225,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_1)' . '<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 32a56b6..2a9156e 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_1"} export FREEBSD_PARENT_BRANCH=${FREEBSD_PARENT_BRANCH:-"releng/10.3"} export FREEBSD_SRC_DIR=${FREEBSD_SRC_DIR:-"${SCRATCHDIR}/FreeBSD-src"} @@ -270,7 +270,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_1"} # Host to rsync pkg repos from poudriere export PKG_RSYNC_HOSTNAME=${PKG_RSYNC_HOSTNAME:-${STAGING_HOSTNAME}} |
