Revert "Add new repos to lead users to 2.4.0 on amd64"

This reverts commit 42eecfeff0f6c1326a7dd7669cb48a7eccead0a6.

11 files changed, 5 insertions, 51 deletions

diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index 35855b7..5da3ac5 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -2476,18 +2476,12 @@ EOF
 
 	# Copy over pkg repo templates to pfSense-repo
 	mkdir -p /usr/local/poudriere/ports/${POUDRIERE_PORTS_NAME}/sysutils/${PRODUCT_NAME}-repo/files
+	cp -f ${PKG_REPO_BASE}/* \
+		/usr/local/poudriere/ports/${POUDRIERE_PORTS_NAME}/sysutils/${PRODUCT_NAME}-repo/files
 
 	for jail_arch in ${_archs}; do
 		jail_name=$(poudriere_jail_name ${jail_arch})
 
-		if [ "${jail_arch}" = "i386.i386" ]; then
-			cp -f ${PKG_REPO_BASE}_i386/* \
-				/usr/local/poudriere/ports/${POUDRIERE_PORTS_NAME}/sysutils/${PRODUCT_NAME}-repo/files
-		else
-			cp -f ${PKG_REPO_BASE}/* \
-				/usr/local/poudriere/ports/${POUDRIERE_PORTS_NAME}/sysutils/${PRODUCT_NAME}-repo/files
-		fi
-
 		if ! poudriere jail -i -j "${jail_name}" >/dev/null 2>&1; then
 			echo ">>> Poudriere jail ${jail_name} not found, skipping..." | tee -a ${LOGFILE}
 			continue
diff --git a/tools/templates/pkg_repos/pfSense-repo-devel.descr b/tools/templates/pkg_repos/pfSense-repo-devel.descr
index 8c214ec..c2c9eb2 100644
--- a/tools/templates/pkg_repos/pfSense-repo-devel.descr
+++ b/tools/templates/pkg_repos/pfSense-repo-devel.descr
@@ -1 +1 @@
-Development Snapshots (Experimental 2.3.x)
+Development Snapshots (Experimental)
diff --git a/tools/templates/pkg_repos/pfSense-repo.abi b/tools/templates/pkg_repos/pfSense-repo.abi
deleted file mode 100644
index cd3225c..0000000
--- a/tools/templates/pkg_repos/pfSense-repo.abi
+++ /dev/null
@@ -1 +0,0 @@
-FreeBSD:11:%%ARCH%%
diff --git a/tools/templates/pkg_repos/pfSense-repo.altabi b/tools/templates/pkg_repos/pfSense-repo.altabi
deleted file mode 100644
index ac860a1..0000000
--- a/tools/templates/pkg_repos/pfSense-repo.altabi
+++ /dev/null
@@ -1 +0,0 @@
-freebsd:11:%%ARCH%%
diff --git a/tools/templates/pkg_repos/pfSense-repo.conf b/tools/templates/pkg_repos/pfSense-repo.conf
index f501c86..6cde860 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%%_v2_4_0_%%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%%_v2_4_0_%%ARCH%%-%%PRODUCT_NAME%%_v2_4_0",
+  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",
diff --git a/tools/templates/pkg_repos_i386/pfSense-repo-devel.conf b/tools/templates/pkg_repos_i386/pfSense-repo-devel.conf
deleted file mode 100644
index dba6a6a..0000000
--- a/tools/templates/pkg_repos_i386/pfSense-repo-devel.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-FreeBSD: { enabled: no }
-
-%%PRODUCT_NAME%%-core: {
-  url: "%%PKG_REPO_SERVER_DEVEL%%/%%PRODUCT_NAME%%_%%PKG_REPO_BRANCH_DEVEL%%_%%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%%_%%PKG_REPO_BRANCH_DEVEL%%_%%ARCH%%-%%PRODUCT_NAME%%_%%PKG_REPO_BRANCH_DEVEL%%",
-  mirror_type: "srv",
-  signature_type: "fingerprints",
-  fingerprints: "/usr/local/share/%%PRODUCT_NAME%%/keys/pkg",
-  enabled: yes
-}
diff --git a/tools/templates/pkg_repos_i386/pfSense-repo-devel.descr b/tools/templates/pkg_repos_i386/pfSense-repo-devel.descr
deleted file mode 100644
index 8c214ec..0000000
--- a/tools/templates/pkg_repos_i386/pfSense-repo-devel.descr
+++ /dev/null
@@ -1 +0,0 @@
-Development Snapshots (Experimental 2.3.x)
diff --git a/tools/templates/pkg_repos_i386/pfSense-repo.abi b/tools/templates/pkg_repos_i386/pfSense-repo.abi
deleted file mode 100644
index 742d2af..0000000
--- a/tools/templates/pkg_repos_i386/pfSense-repo.abi
+++ /dev/null
@@ -1 +0,0 @@
-FreeBSD:10:%%ARCH%%
diff --git a/tools/templates/pkg_repos_i386/pfSense-repo.altabi b/tools/templates/pkg_repos_i386/pfSense-repo.altabi
deleted file mode 100644
index e12ae76..0000000
--- a/tools/templates/pkg_repos_i386/pfSense-repo.altabi
+++ /dev/null
@@ -1 +0,0 @@
-freebsd:10:%%ARCH%%
diff --git a/tools/templates/pkg_repos_i386/pfSense-repo.conf b/tools/templates/pkg_repos_i386/pfSense-repo.conf
deleted file mode 100644
index 6cde860..0000000
--- a/tools/templates/pkg_repos_i386/pfSense-repo.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_i386/pfSense-repo.descr b/tools/templates/pkg_repos_i386/pfSense-repo.descr
deleted file mode 100644
index e892126..0000000
--- a/tools/templates/pkg_repos_i386/pfSense-repo.descr
+++ /dev/null
@@ -1 +0,0 @@
-Stable (Default)