From 37c3cf84d0ddba30e58740cf7d8e435bc829888f Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Thu, 20 Sep 2018 08:32:36 -0300 Subject: [PATCH] Remove 2.3.x and 2.4.4-RC repos, make 2.4.4 the new stable RELEASE --- tools/builder_defaults.sh | 4 ++-- tools/conf/pfPorts/make.conf | 3 +-- tools/templates/pkg_repos/pfSense-repo-244.abi | 1 - .../templates/pkg_repos/pfSense-repo-244.altabi | 1 - tools/templates/pkg_repos/pfSense-repo-244.conf | 17 ----------------- .../templates/pkg_repos/pfSense-repo-244.descr | 1 - .../pkg_repos/pfSense-repo-legacy-23.abi | 1 - .../pkg_repos/pfSense-repo-legacy-23.altabi | 1 - .../pkg_repos/pfSense-repo-legacy-23.conf | 17 ----------------- .../pkg_repos/pfSense-repo-legacy-23.descr | 1 - .../pkg_repos/pfSense-repo-legacy-devel-23.abi | 1 - .../pfSense-repo-legacy-devel-23.altabi | 1 - .../pkg_repos/pfSense-repo-legacy-devel-23.conf | 17 ----------------- .../pfSense-repo-legacy-devel-23.descr | 1 - tools/templates/pkg_repos/pfSense-repo.conf | 4 ++-- 15 files changed, 5 insertions(+), 66 deletions(-) delete mode 100644 tools/templates/pkg_repos/pfSense-repo-244.abi delete mode 100644 tools/templates/pkg_repos/pfSense-repo-244.altabi delete mode 100644 tools/templates/pkg_repos/pfSense-repo-244.conf delete mode 100644 tools/templates/pkg_repos/pfSense-repo-244.descr delete mode 100644 tools/templates/pkg_repos/pfSense-repo-legacy-23.abi delete mode 100644 tools/templates/pkg_repos/pfSense-repo-legacy-23.altabi delete mode 100644 tools/templates/pkg_repos/pfSense-repo-legacy-23.conf delete mode 100644 tools/templates/pkg_repos/pfSense-repo-legacy-23.descr delete mode 100644 tools/templates/pkg_repos/pfSense-repo-legacy-devel-23.abi delete mode 100644 tools/templates/pkg_repos/pfSense-repo-legacy-devel-23.altabi delete mode 100644 tools/templates/pkg_repos/pfSense-repo-legacy-devel-23.conf delete mode 100644 tools/templates/pkg_repos/pfSense-repo-legacy-devel-23.descr diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index 37c955392e..be9825205b 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -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"} diff --git a/tools/conf/pfPorts/make.conf b/tools/conf/pfPorts/make.conf index 0c8759c4e4..75ea9f4b7e 100644 --- a/tools/conf/pfPorts/make.conf +++ b/tools/conf/pfPorts/make.conf @@ -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 diff --git a/tools/templates/pkg_repos/pfSense-repo-244.abi b/tools/templates/pkg_repos/pfSense-repo-244.abi deleted file mode 100644 index cd3225c707..0000000000 --- a/tools/templates/pkg_repos/pfSense-repo-244.abi +++ /dev/null @@ -1 +0,0 @@ -FreeBSD:11:%%ARCH%% diff --git a/tools/templates/pkg_repos/pfSense-repo-244.altabi b/tools/templates/pkg_repos/pfSense-repo-244.altabi deleted file mode 100644 index ac860a1acf..0000000000 --- a/tools/templates/pkg_repos/pfSense-repo-244.altabi +++ /dev/null @@ -1 +0,0 @@ -freebsd:11:%%ARCH%% diff --git a/tools/templates/pkg_repos/pfSense-repo-244.conf b/tools/templates/pkg_repos/pfSense-repo-244.conf deleted file mode 100644 index 6cde860d74..0000000000 --- a/tools/templates/pkg_repos/pfSense-repo-244.conf +++ /dev/null @@ -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 -} diff --git a/tools/templates/pkg_repos/pfSense-repo-244.descr b/tools/templates/pkg_repos/pfSense-repo-244.descr deleted file mode 100644 index 5b9f01f27f..0000000000 --- a/tools/templates/pkg_repos/pfSense-repo-244.descr +++ /dev/null @@ -1 +0,0 @@ -Next Release Candidate (2.4.4-RC) diff --git a/tools/templates/pkg_repos/pfSense-repo-legacy-23.abi b/tools/templates/pkg_repos/pfSense-repo-legacy-23.abi deleted file mode 100644 index 742d2af661..0000000000 --- a/tools/templates/pkg_repos/pfSense-repo-legacy-23.abi +++ /dev/null @@ -1 +0,0 @@ -FreeBSD:10:%%ARCH%% diff --git a/tools/templates/pkg_repos/pfSense-repo-legacy-23.altabi b/tools/templates/pkg_repos/pfSense-repo-legacy-23.altabi deleted file mode 100644 index e12ae76162..0000000000 --- a/tools/templates/pkg_repos/pfSense-repo-legacy-23.altabi +++ /dev/null @@ -1 +0,0 @@ -freebsd:10:%%ARCH%% diff --git a/tools/templates/pkg_repos/pfSense-repo-legacy-23.conf b/tools/templates/pkg_repos/pfSense-repo-legacy-23.conf deleted file mode 100644 index 8f6c9ed9ab..0000000000 --- a/tools/templates/pkg_repos/pfSense-repo-legacy-23.conf +++ /dev/null @@ -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 -} diff --git a/tools/templates/pkg_repos/pfSense-repo-legacy-23.descr b/tools/templates/pkg_repos/pfSense-repo-legacy-23.descr deleted file mode 100644 index 0fbddb7ca4..0000000000 --- a/tools/templates/pkg_repos/pfSense-repo-legacy-23.descr +++ /dev/null @@ -1 +0,0 @@ -Legacy stable version (Security/Errata only 2.3.x) diff --git a/tools/templates/pkg_repos/pfSense-repo-legacy-devel-23.abi b/tools/templates/pkg_repos/pfSense-repo-legacy-devel-23.abi deleted file mode 100644 index 742d2af661..0000000000 --- a/tools/templates/pkg_repos/pfSense-repo-legacy-devel-23.abi +++ /dev/null @@ -1 +0,0 @@ -FreeBSD:10:%%ARCH%% diff --git a/tools/templates/pkg_repos/pfSense-repo-legacy-devel-23.altabi b/tools/templates/pkg_repos/pfSense-repo-legacy-devel-23.altabi deleted file mode 100644 index e12ae76162..0000000000 --- a/tools/templates/pkg_repos/pfSense-repo-legacy-devel-23.altabi +++ /dev/null @@ -1 +0,0 @@ -freebsd:10:%%ARCH%% diff --git a/tools/templates/pkg_repos/pfSense-repo-legacy-devel-23.conf b/tools/templates/pkg_repos/pfSense-repo-legacy-devel-23.conf deleted file mode 100644 index 5ac53f8b6e..0000000000 --- a/tools/templates/pkg_repos/pfSense-repo-legacy-devel-23.conf +++ /dev/null @@ -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 -} diff --git a/tools/templates/pkg_repos/pfSense-repo-legacy-devel-23.descr b/tools/templates/pkg_repos/pfSense-repo-legacy-devel-23.descr deleted file mode 100644 index a6e88d17a4..0000000000 --- a/tools/templates/pkg_repos/pfSense-repo-legacy-devel-23.descr +++ /dev/null @@ -1 +0,0 @@ -Legacy development snapshots (Experimental 2.3.x DEVEL) diff --git a/tools/templates/pkg_repos/pfSense-repo.conf b/tools/templates/pkg_repos/pfSense-repo.conf index efacd7b756..6cde860d74 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%%_%%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",