Remove 2.3.x and 2.4.4-RC repos, make 2.4.4 the new stable RELEASE

This commit is contained in:
Renato Botelho 2018-09-20 08:32:36 -03:00
parent 810503dfc1
commit 37c3cf84d0
15 changed files with 5 additions and 66 deletions

View File

@ -289,7 +289,7 @@ if [ -n "${_IS_RELEASE}" -o -n "${_IS_RC}" ]; then
export PKG_REPO_BRANCH_DEVEL=${PKG_REPO_BRANCH_DEVEL:-"${REPO_BRANCH_PREFIX}master"}
export PKG_REPO_BRANCH_STAGING=${PKG_REPO_BRANCH_STAGING:-${PKG_REPO_BRANCH_RELEASE}}
else
export PKG_REPO_BRANCH_RELEASE=${PKG_REPO_BRANCH_RELEASE:-"${REPO_BRANCH_PREFIX}v2_4_3"}
export PKG_REPO_BRANCH_RELEASE=${PKG_REPO_BRANCH_RELEASE:-"${REPO_BRANCH_PREFIX}v2_4_4"}
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
@ -311,7 +311,7 @@ export CORE_PKG_REAL_PATH="${CORE_PKG_PATH}/.real_${DATESTRING}"
export CORE_PKG_ALL_PATH="${CORE_PKG_PATH}/All"
export PKG_REPO_BASE=${PKG_REPO_BASE:-"${BUILDER_TOOLS}/templates/pkg_repos"}
export PFSENSE_DEFAULT_REPO="${PRODUCT_NAME}-repo-244"
export PFSENSE_DEFAULT_REPO="${PRODUCT_NAME}-repo"
export PKG_REPO_DEFAULT=${PKG_REPO_DEFAULT:-"${PKG_REPO_BASE}/${PFSENSE_DEFAULT_REPO}.conf"}
export PFSENSE_BUILD_REPO="${PFSENSE_DEFAULT_REPO}"
export PKG_REPO_BUILD=${PKG_REPO_BUILD:-"${PKG_REPO_BASE}/${PFSENSE_BUILD_REPO}.conf"}

View File

@ -1,6 +1,5 @@
# Define pfSense repos
PFSENSE_REPOS= pfSense-repo pfSense-repo-devel pfSense-repo-legacy-devel-23 \
pfSense-repo-legacy-23 pfSense-repo-244
PFSENSE_REPOS= pfSense-repo pfSense-repo-devel
# Generic options
OPTIONS_UNSET_FORCE= X11 DOCS EXAMPLES MAN INFO MANPAGES

View File

@ -1 +0,0 @@
FreeBSD:11:%%ARCH%%

View File

@ -1 +0,0 @@
freebsd:11:%%ARCH%%

View File

@ -1,17 +0,0 @@
FreeBSD: { enabled: no }
%%PRODUCT_NAME%%-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",
enabled: yes
}
%%PRODUCT_NAME%%: {
url: "%%PKG_REPO_SERVER_RELEASE%%/%%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",
enabled: yes
}

View File

@ -1 +0,0 @@
Next Release Candidate (2.4.4-RC)

View File

@ -1 +0,0 @@
FreeBSD:10:%%ARCH%%

View File

@ -1 +0,0 @@
freebsd:10:%%ARCH%%

View File

@ -1,17 +0,0 @@
FreeBSD: { enabled: no }
%%PRODUCT_NAME%%-core: {
url: "%%PKG_REPO_SERVER_RELEASE%%/%%PRODUCT_NAME%%_%%REPO_BRANCH_PREFIX%%v2_3_5_%%ARCH%%-core",
mirror_type: "srv",
signature_type: "fingerprints",
fingerprints: "/usr/local/share/%%PRODUCT_NAME%%/keys/pkg",
enabled: yes
}
%%PRODUCT_NAME%%: {
url: "%%PKG_REPO_SERVER_RELEASE%%/%%PRODUCT_NAME%%_%%REPO_BRANCH_PREFIX%%v2_3_5_%%ARCH%%-%%PRODUCT_NAME%%_%%REPO_BRANCH_PREFIX%%v2_3_5",
mirror_type: "srv",
signature_type: "fingerprints",
fingerprints: "/usr/local/share/%%PRODUCT_NAME%%/keys/pkg",
enabled: yes
}

View File

@ -1 +0,0 @@
Legacy stable version (Security/Errata only 2.3.x)

View File

@ -1 +0,0 @@
FreeBSD:10:%%ARCH%%

View File

@ -1 +0,0 @@
freebsd:10:%%ARCH%%

View File

@ -1,17 +0,0 @@
FreeBSD: { enabled: no }
%%PRODUCT_NAME%%-core: {
url: "%%PKG_REPO_SERVER_DEVEL%%/%%PRODUCT_NAME%%_%%REPO_BRANCH_PREFIX%%v2_3_%%ARCH%%-core",
mirror_type: "srv",
signature_type: "fingerprints",
fingerprints: "/usr/local/share/%%PRODUCT_NAME%%/keys/pkg",
enabled: yes
}
%%PRODUCT_NAME%%: {
url: "%%PKG_REPO_SERVER_DEVEL%%/%%PRODUCT_NAME%%_%%REPO_BRANCH_PREFIX%%v2_3_%%ARCH%%-%%PRODUCT_NAME%%_%%REPO_BRANCH_PREFIX%%v2_3",
mirror_type: "srv",
signature_type: "fingerprints",
fingerprints: "/usr/local/share/%%PRODUCT_NAME%%/keys/pkg",
enabled: yes
}

View File

@ -1 +0,0 @@
Legacy development snapshots (Experimental 2.3.x DEVEL)

View File

@ -1,7 +1,7 @@
FreeBSD: { enabled: no }
%%PRODUCT_NAME%%-core: {
url: "%%PKG_REPO_SERVER_RELEASE%%/%%PRODUCT_NAME%%_%%REPO_BRANCH_PREFIX%%v2_4_3_%%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_RELEASE%%/%%PRODUCT_NAME%%_%%REPO_BRANCH_PREFIX%%v2_4_3_%%ARCH%%-%%PRODUCT_NAME%%_%%REPO_BRANCH_PREFIX%%v2_4_3",
url: "%%PKG_REPO_SERVER_RELEASE%%/%%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",