Revision 73a1434a
Added by Renato Botelho over 4 years ago
| src/etc/phpshellsessions/gitsync | ||
|---|---|---|
| 30 | 30 |
$GIT_PKG = "git"; // Either "git" or the full package URL |
| 31 | 31 |
$GIT_BIN= "/usr/local/bin/git"; |
| 32 | 32 |
$GIT_REPO = "git://github.com/pfsense/pfsense.git"; |
| 33 |
$DEFAULT_BRANCH = "RELENG_2_5_0";
|
|
| 33 |
$DEFAULT_BRANCH = "RELENG_2_5_1";
|
|
| 34 | 34 |
$CODIR = "/root/pfsense"; |
| 35 | 35 |
$GITSYNC_MERGE = "/root/.gitsync_merge"; |
| 36 | 36 |
|
| 37 | 37 |
/* NOTE: Set branches here */ |
| 38 | 38 |
$branches = array( |
| 39 | 39 |
"master" => "2.6.0 development branch", |
| 40 |
"RELENG_2_5_0" => "2.5.0 stable branch",
|
|
| 40 |
"RELENG_2_5_1" => "2.5.1 stable branch",
|
|
| 41 | 41 |
"build_commit" => "The commit originally used to build the image" |
| 42 | 42 |
); |
| 43 | 43 |
|
| src/etc/version | ||
|---|---|---|
| 1 |
2.5.0-RELEASE |
|
| 1 |
2.5.1-RC |
|
| src/usr/local/www/system_update_settings.php | ||
|---|---|---|
| 206 | 206 |
'Branch name', |
| 207 | 207 |
'text', |
| 208 | 208 |
($gitcfg['branch'] ? $gitcfg['branch'] : '') |
| 209 |
))->setHelp('The most recently used branch was "%1$s". (Usually the branch name is RELENG_2_5_0)' .
|
|
| 209 |
))->setHelp('The most recently used branch was "%1$s". (Usually the branch name is RELENG_2_5_1)' .
|
|
| 210 | 210 |
'%2$sNote: Sync will not be performed if a branch is not specified.', $lastbranch, '<br />'); |
| 211 | 211 |
|
| 212 | 212 |
$group = new Form_Group('Sync options');
|
| tools/builder_defaults.sh | ||
|---|---|---|
| 108 | 108 |
|
| 109 | 109 |
# This is used for using svn for retrieving src |
| 110 | 110 |
export FREEBSD_REPO_BASE=${FREEBSD_REPO_BASE:-"${GIT_REPO_BASE}/freebsd-src.git"}
|
| 111 |
export FREEBSD_BRANCH=${FREEBSD_BRANCH:-"${REPO_BRANCH_PREFIX}RELENG_2_5_0"}
|
|
| 111 |
export FREEBSD_BRANCH=${FREEBSD_BRANCH:-"${REPO_BRANCH_PREFIX}RELENG_2_5_1"}
|
|
| 112 | 112 |
export FREEBSD_SRC_DIR=${FREEBSD_SRC_DIR:-"${SCRATCHDIR}/FreeBSD-src"}
|
| 113 | 113 |
|
| 114 | 114 |
export BUILD_KERNELS=${BUILD_KERNELS:-"${PRODUCT_NAME}"}
|
| ... | ... | |
| 215 | 215 |
else |
| 216 | 216 |
export POUDRIERE_PORTS_GIT_URL=${POUDRIERE_PORTS_GIT_URL:-"${GIT_REPO_BASE}/${REPO_BRANCH_PREFIX}ports.git"}
|
| 217 | 217 |
fi |
| 218 |
export POUDRIERE_PORTS_GIT_BRANCH=${POUDRIERE_PORTS_GIT_BRANCH:-"${REPO_BRANCH_PREFIX}RELENG_2_5_0"}
|
|
| 218 |
export POUDRIERE_PORTS_GIT_BRANCH=${POUDRIERE_PORTS_GIT_BRANCH:-"${REPO_BRANCH_PREFIX}RELENG_2_5_1"}
|
|
| 219 | 219 |
|
| 220 | 220 |
# Use vX_Y instead of RELENG_X_Y for poudriere to make it shorter |
| 221 | 221 |
POUDRIERE_PORTS_BRANCH=$(echo "${POUDRIERE_PORTS_GIT_BRANCH}" | sed 's,RELENG_,v,')
|
| ... | ... | |
| 312 | 312 |
export CORE_PKG_ALL_PATH="${CORE_PKG_PATH}/All"
|
| 313 | 313 |
|
| 314 | 314 |
export PKG_REPO_BASE=${PKG_REPO_BASE:-"${BUILDER_TOOLS}/templates/pkg_repos"}
|
| 315 |
export PFSENSE_DEFAULT_REPO="${PRODUCT_NAME}-repo"
|
|
| 315 |
export PFSENSE_DEFAULT_REPO="${PRODUCT_NAME}-repo-251"
|
|
| 316 | 316 |
export PKG_REPO_DEFAULT=${PKG_REPO_DEFAULT:-"${PKG_REPO_BASE}/${PFSENSE_DEFAULT_REPO}.conf"}
|
| 317 | 317 |
export PFSENSE_BUILD_REPO="${PFSENSE_DEFAULT_REPO}"
|
| 318 | 318 |
export PKG_REPO_BUILD=${PKG_REPO_BUILD:-"${PKG_REPO_BASE}/${PFSENSE_BUILD_REPO}.conf"}
|
| tools/conf/pfPorts/make.conf | ||
|---|---|---|
| 1 | 1 |
ALLOW_UNSUPPORTED_SYSTEM=yes |
| 2 | 2 |
|
| 3 | 3 |
# Define pfSense repos |
| 4 |
PFSENSE_REPOS= %%PRODUCT_NAME%%-repo %%PRODUCT_NAME%%-repo-devel %%PRODUCT_NAME%%-repo-245 |
|
| 4 |
PFSENSE_REPOS= %%PRODUCT_NAME%%-repo %%PRODUCT_NAME%%-repo-devel %%PRODUCT_NAME%%-repo-245 %%PRODUCT_NAME%%-repo-251
|
|
| 5 | 5 |
|
| 6 | 6 |
# Generic options |
| 7 | 7 |
OPTIONS_UNSET_FORCE= DOCS DOXYGEN EXAMPLES INFO MAN MANPAGES X11 |
| tools/templates/pkg_repos/pfSense-repo-251.abi | ||
|---|---|---|
| 1 |
FreeBSD:12:%%ARCH%% |
|
| tools/templates/pkg_repos/pfSense-repo-251.altabi | ||
|---|---|---|
| 1 |
freebsd:12:%%ARCH%% |
|
| tools/templates/pkg_repos/pfSense-repo-251.conf | ||
|---|---|---|
| 1 |
FreeBSD: { enabled: no }
|
|
| 2 |
|
|
| 3 |
%%PRODUCT_NAME%%-core: {
|
|
| 4 |
url: "%%PKG_REPO_SERVER_RELEASE%%/%%PRODUCT_NAME%%_%%PKG_REPO_BRANCH_RELEASE%%_%%ARCH%%-core", |
|
| 5 |
mirror_type: "srv", |
|
| 6 |
signature_type: "fingerprints", |
|
| 7 |
fingerprints: "/usr/local/share/%%PRODUCT_NAME%%/keys/pkg", |
|
| 8 |
enabled: yes |
|
| 9 |
} |
|
| 10 |
|
|
| 11 |
%%PRODUCT_NAME%%: {
|
|
| 12 |
url: "%%PKG_REPO_SERVER_RELEASE%%/%%PRODUCT_NAME%%_%%PKG_REPO_BRANCH_RELEASE%%_%%ARCH%%-%%PRODUCT_NAME%%_%%PKG_REPO_BRANCH_RELEASE%%", |
|
| 13 |
mirror_type: "srv", |
|
| 14 |
signature_type: "fingerprints", |
|
| 15 |
fingerprints: "/usr/local/share/%%PRODUCT_NAME%%/keys/pkg", |
|
| 16 |
enabled: yes |
|
| 17 |
} |
|
| tools/templates/pkg_repos/pfSense-repo-251.descr | ||
|---|---|---|
| 1 |
Next pfSense Release Candidate (2.5.1-RC) |
|
| tools/templates/pkg_repos/pfSense-repo.conf | ||
|---|---|---|
| 1 | 1 |
FreeBSD: { enabled: no }
|
| 2 | 2 |
|
| 3 | 3 |
%%PRODUCT_NAME%%-core: {
|
| 4 |
url: "%%PKG_REPO_SERVER_RELEASE%%/%%PRODUCT_NAME%%_%%PKG_REPO_BRANCH_RELEASE%%_%%ARCH%%-core",
|
|
| 4 |
url: "%%PKG_REPO_SERVER_RELEASE%%/%%PRODUCT_NAME%%_%%REPO_BRANCH_PREFIX%%v2_5_0_%%ARCH%%-core",
|
|
| 5 | 5 |
mirror_type: "srv", |
| 6 | 6 |
signature_type: "fingerprints", |
| 7 | 7 |
fingerprints: "/usr/local/share/%%PRODUCT_NAME%%/keys/pkg", |
| ... | ... | |
| 9 | 9 |
} |
| 10 | 10 |
|
| 11 | 11 |
%%PRODUCT_NAME%%: {
|
| 12 |
url: "%%PKG_REPO_SERVER_RELEASE%%/%%PRODUCT_NAME%%_%%PKG_REPO_BRANCH_RELEASE%%_%%ARCH%%-%%PRODUCT_NAME%%_%%PKG_REPO_BRANCH_RELEASE%%",
|
|
| 12 |
url: "%%PKG_REPO_SERVER_RELEASE%%/%%PRODUCT_NAME%%_%%REPO_BRANCH_PREFIX%%v2_5_0_%%ARCH%%-%%PRODUCT_NAME%%_%%REPO_BRANCH_PREFIX%%v2_5_0",
|
|
| 13 | 13 |
mirror_type: "srv", |
| 14 | 14 |
signature_type: "fingerprints", |
| 15 | 15 |
fingerprints: "/usr/local/share/%%PRODUCT_NAME%%/keys/pkg", |
Also available in: Unified diff
Welcome pfSense CE 2.5.1-RELEASE