diff options
author | Renato Botelho <renato@netgate.com> | 2017-02-11 17:26:09 -0200 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2017-02-11 17:26:09 -0200 |
commit | e4b2f69f69565573ac429ae11281ea1cc386bec5 (patch) | |
tree | bf225d3ca43d4bb1162a95534c3cace3c45e16f1 /tools | |
parent | 26f2e7511c9d4839b5ffb9924f10f81cb1403474 (diff) | |
download | pfsense-e4b2f69f69565573ac429ae11281ea1cc386bec5.zip pfsense-e4b2f69f69565573ac429ae11281ea1cc386bec5.tar.gz |
Point to 2.3.3 branch on devel server while in RC
Diffstat (limited to 'tools')
-rw-r--r-- | tools/builder_defaults.sh | 2 | ||||
-rw-r--r-- | tools/templates/pkg_repos/pfSense-repo.conf | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index 3a2d8a7..bf4cc18 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -331,7 +331,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_2"} + export PKG_REPO_BRANCH_RELEASE=${PKG_REPO_BRANCH_RELEASE:-"v2_3_3"} 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 6cde860..953ecfd 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_RELEASE%%/%%PRODUCT_NAME%%_%%PKG_REPO_BRANCH_RELEASE%%_%%ARCH%%-core", + url: "%%PKG_REPO_SERVER_DEVEL%%/%%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_RELEASE%%/%%PRODUCT_NAME%%_%%PKG_REPO_BRANCH_RELEASE%%_%%ARCH%%-%%PRODUCT_NAME%%_%%PKG_REPO_BRANCH_RELEASE%%", + url: "%%PKG_REPO_SERVER_DEVEL%%/%%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", |