summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2017-08-18 10:38:15 -0300
committerRenato Botelho <renato@netgate.com>2017-08-18 10:38:15 -0300
commitd1c9e8f96f789c784337983c2b83fb60430c1595 (patch)
tree7a25e915465b67420e1935f1ec0f76ce759d856e /tools
parent726df7ce254add4910d8a3898edbd614f1332ba3 (diff)
downloadpfsense-d1c9e8f96f789c784337983c2b83fb60430c1595.zip
pfsense-d1c9e8f96f789c784337983c2b83fb60430c1595.tar.gz
Bump to 2.4.1-DEVELOPMENT
Diffstat (limited to 'tools')
-rw-r--r--tools/builder_defaults.sh2
-rw-r--r--tools/templates/pkg_repos/pfSense-repo.conf4
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh
index b0e4834..823ba81 100644
--- a/tools/builder_defaults.sh
+++ b/tools/builder_defaults.sh
@@ -279,7 +279,7 @@ if [ -n "${_IS_RELEASE}" -o -n "${_IS_RC}" ]; then
export PKG_REPO_BRANCH_DEVEL=${PKG_REPO_BRANCH_DEVEL:-${POUDRIERE_BRANCH}}
export PKG_REPO_BRANCH_STAGING=${PKG_REPO_BRANCH_STAGING:-${PKG_REPO_BRANCH_RELEASE}}
else
- export PKG_REPO_BRANCH_RELEASE=${PKG_REPO_BRANCH_RELEASE:-${POUDRIERE_BRANCH}}
+ export PKG_REPO_BRANCH_RELEASE=${PKG_REPO_BRANCH_RELEASE:-"v2_4_0"}
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 c4e69fa..42f1c0e 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%%-%%POUDRIERE_PORTS_NAME%%",
+ url: "%%PKG_REPO_SERVER_RELEASE%%/%%PRODUCT_NAME%%_%%PKG_REPO_BRANCH_RELEASE%%_%%ARCH%%-%%POUDRIERE_PORTS_NAME%%",
mirror_type: "srv",
signature_type: "fingerprints",
fingerprints: "/usr/local/share/%%PRODUCT_NAME%%/keys/pkg",
OpenPOWER on IntegriCloud