Explicit define pkg repo variables for release and devel

4 files changed, 42 insertions, 32 deletions

diff --git a/build.conf.sample b/build.conf.sample
index 1d1a247..1881605 100644
--- a/build.conf.sample
+++ b/build.conf.sample
@@ -75,7 +75,10 @@ export PRODUCT_URL="https://PRODUCT_URL/"
 #export PKG_RSYNC_DESTDIR="/usr/local/www/beta/packages"
 
 # pkg repo URL
-#export PKG_REPO_SERVER="pkg+http://beta.pfsense.org/packages"
+#export PKG_REPO_SERVER_DEVEL="pkg+http://beta.pfsense.org/packages"
+#export PKG_REPO_SERVER_RELEASE="pkg+http://pkg.pfsense.org/packages"
+#export PKG_REPO_SERVER_STAGING="pkg+http://release-staging.netgate.com/packages"
 
 # Branch to replace pkg.conf template, defaults to $GIT_REPO_BRANCH_OR_TAG
-#export PKG_REPO_CONF_BRANCH="BRANCH"
+#export PKG_REPO_BRANCH_DEVEL="BRANCH"
+#export PKG_REPO_BRANCH_RELEASE="BRANCH"
diff --git a/build.sh b/build.sh
index 19d8adb..d800cf2 100755
--- a/build.sh
+++ b/build.sh
@@ -309,8 +309,11 @@ if [ -n "${SNAPSHOTS}" -a -z "${DO_NOT_UPLOAD}" ]; then
 		PKG_RSYNC_USERNAME \
 		PKG_RSYNC_SSH_PORT \
 		PKG_RSYNC_DESTDIR \
-		PKG_REPO_SERVER \
-		PKG_REPO_CONF_BRANCH"
+		PKG_REPO_SERVER_DEVEL \
+		PKG_REPO_SERVER_RELEASE \
+		PKG_REPO_SERVER_STAGING \
+		PKG_REPO_BRANCH_DEVEL \
+		PKG_REPO_BRANCH_RELEASE"
 
 	for _var in ${_required}; do
 		eval "_value=\${$_var}"
diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index 1e7b385..6b8a638 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -1147,8 +1147,7 @@ clone_to_staging_area() {
 		${PKG_REPO_DEFAULT} \
 		${STAGE_CHROOT_DIR}${PRODUCT_SHARE_DIR}/${PRODUCT_NAME}-repo.conf \
 		${TARGET} \
-		${TARGET_ARCH} \
-		${PKG_REPO_CONF_BRANCH}
+		${TARGET_ARCH}
 
 	mtree \
 		-c \
@@ -1170,9 +1169,7 @@ clone_to_staging_area() {
 		${PKG_REPO_DEFAULT} \
 		${_share_repos_path}/${PRODUCT_NAME}-repo.conf \
 		${TARGET} \
-		${TARGET_ARCH} \
-		${PKG_REPO_CONF_BRANCH} \
-		${PKG_REPO_SERVER_RELEASE}
+		${TARGET_ARCH}
 
 	cp -f ${PKG_REPO_DEFAULT%%.conf}.descr ${_share_repos_path}
 
@@ -1183,9 +1180,7 @@ clone_to_staging_area() {
 			${_template} \
 			${_share_repos_path}/${_template_filename} \
 			${TARGET} \
-			${TARGET_ARCH} \
-			${PKG_REPO_CONF_BRANCH} \
-			${PKG_REPO_SERVER_RELEASE}
+			${TARGET_ARCH}
 		cp -f ${_template%%.conf}.descr ${_share_repos_path}
 	done
 
@@ -1307,11 +1302,11 @@ customize_stagearea_for_image() {
 	# XXX: Workaround to avoid pkg to complain regarding release
 	#      repo on first boot since packages are installed from
 	#      staging server during build phase
-	if [ "${PKG_REPO_SERVER}" != "${PKG_REPO_SERVER_RELEASE}" ]; then
+	if [ -n "${USE_PKG_REPO_STAGING}" ]; then
 		_read_cmd="select value from repodata where key='packagesite'"
 		for _db in ${FINAL_CHROOT_DIR}/var/db/pkg/repo-*sqlite; do
 			_cur=$(/usr/local/bin/sqlite3 ${_db} "${_read_cmd}")
-			_new=$(echo "${_cur}" | sed -e "s,^${PKG_REPO_SERVER},${PKG_REPO_SERVER_RELEASE},")
+			_new=$(echo "${_cur}" | sed -e "s,^${PKG_REPO_SERVER_STAGING},${PKG_REPO_SERVER_RELEASE},")
 			/usr/local/bin/sqlite3 ${_db} "update repodata set value='${_new}' where key='packagesite'"
 		done
 	fi
@@ -1528,7 +1523,7 @@ create_memstick_adi_image() {
 
 # Create pkg conf on desired place with desired arch/branch
 setup_pkg_repo() {
-	if [ -z "${5}" ]; then
+	if [ -z "${4}" ]; then
 		return
 	fi
 
@@ -1536,24 +1531,27 @@ setup_pkg_repo() {
 	local _target="${2}"
 	local _arch="${3}"
 	local _target_arch="${4}"
-	local _branch="${5}"
-	local _pkg_repo_server="${6}"
+	local _staging="${5}"
 
 	if [ -z "${_template}" -o ! -f "${_template}" ]; then
 		echo ">>> ERROR: It was not possible to find pkg conf template ${_template}"
 		print_error_pfS
 	fi
 
-	if [ -z "${_pkg_repo_server}" ]; then
-		_pkg_repo_server=${PKG_REPO_SERVER}
+	if [ -n "${_staging}" -a -n "${USE_PKG_REPO_STAGING}" ]; then
+		_pkg_repo_server=${PKG_REPO_SERVER_STAGING}
+	else
+		_pkg_repo_server=${PKG_REPO_SERVER_RELEASE}
 	fi
 
 	mkdir -p $(dirname ${_target}) >/dev/null 2>&1
 
 	sed \
 		-e "s/%%ARCH%%/${_target_arch}/" \
-		-e "s/%%GIT_REPO_BRANCH_OR_TAG%%/${_branch}/g" \
-		-e "s,%%PKG_REPO_SERVER%%,${_pkg_repo_server},g" \
+		-e "s/%%PKG_REPO_BRANCH_DEVEL%%/${PKG_REPO_BRANCH_DEVEL}/g" \
+		-e "s/%%PKG_REPO_BRANCH_RELEASE%%/${PKG_REPO_BRANCH_RELEASE}/g" \
+		-e "s,%%PKG_REPO_SERVER_DEVEL%%,${PKG_REPO_SERVER_DEVEL},g" \
+		-e "s,%%PKG_REPO_SERVER_RELEASE%%,${_pkg_repo_server},g" \
 		-e "s/%%PRODUCT_NAME%%/${PRODUCT_NAME}/g" \
 		${_template} \
 		> ${_target}
@@ -1578,8 +1576,7 @@ builder_setup() {
 			${PKG_REPO_DEFAULT} \
 			${PKG_REPO_PATH} \
 			${_arch} \
-			${_arch} \
-			${PKG_REPO_CONF_BRANCH}
+			${_arch}
 
 		# Use fingerprint keys from repo
 		sed -i '' -e "/fingerprints:/ s,\"/,\"${BUILDER_ROOT}/src/," \
@@ -1699,7 +1696,7 @@ pkg_bootstrap() {
 		${_root}${PKG_REPO_PATH} \
 		${TARGET} \
 		${TARGET_ARCH} \
-		${PKG_REPO_CONF_BRANCH}
+		"staging"
 
 	pkg_chroot ${_root} bootstrap -f
 }
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh
index 839c9be..73cb215 100644
--- a/tools/builder_defaults.sh
+++ b/tools/builder_defaults.sh
@@ -275,11 +275,6 @@ export PKG_RSYNC_USERNAME=${PKG_RSYNC_USERNAME:-"wwwsync"}
 export PKG_RSYNC_SSH_PORT=${PKG_RSYNC_SSH_PORT:-"22"}
 export PKG_RSYNC_DESTDIR=${PKG_RSYNC_DESTDIR:-"/usr/local/www/beta/packages"}
 export PKG_RSYNC_LOGS=${PKG_RSYNC_LOGS:-"/usr/local/www/beta"}
-export PKG_REPO_SERVER=${PKG_REPO_SERVER:-"pkg+http://beta.pfsense.org/packages"}
-export PKG_REPO_CONF_BRANCH=${PKG_REPO_CONF_BRANCH:-"${POUDRIERE_BRANCH}"}
-
-# Command used to sign pkg repo
-export PKG_REPO_SIGNING_COMMAND=${PKG_REPO_SIGNING_COMMAND:-""}
 
 unset _IS_RELEASE
 unset CORE_PKG_DATESTRING
@@ -305,12 +300,24 @@ case "${PRODUCT_VERSION##*-}" in
 		exit 1
 esac
 
-if [ -z "${_IS_RELEASE}" ]; then
-	export PKG_REPO_SERVER_RELEASE=${PKG_REPO_SERVER_RELEASE:-$PKG_REPO_SERVER}
+# pkg repo variables
+export PKG_REPO_SERVER_STAGING=${PKG_REPO_SERVER_STAGING:-"pkg+http://release-staging.netgate.com/ce/packages"}
+export PKG_REPO_SERVER_DEVEL=${PKG_REPO_SERVER_DEVEL:-"pkg+http://beta.pfsense.org/packages"}
+export PKG_REPO_SERVER_RELEASE=${PKG_REPO_SERVER_RELEASE:-"pkg+http://pkg.pfsense.org"}
+
+if [ -n "${_IS_RELEASE}" ]; then
+	export USE_PKG_REPO_STAGING="1"
+	export PKG_REPO_BRANCH_RELEASE=${PKG_REPO_BRANCH_RELEASE:-${POUDRIERE_BRANCH}}
+	export PKG_REPO_BRANCH_DEVEL=${PKG_REPO_BRANCH_DEVEL:-"v2_3"}
 else
-	export PKG_REPO_SERVER_RELEASE=${PKG_REPO_SERVER_RELEASE:-"pkg+http://pkg.pfsense.org/packages"}
+	export USE_PKG_REPO_STAGING=""
+	export PKG_REPO_BRANCH_RELEASE=${PKG_REPO_BRANCH_RELEASE:-"v2_3_0"}
+	export PKG_REPO_BRANCH_DEVEL=${PKG_REPO_BRANCH_DEVEL:-${POUDRIERE_BRANCH}}
 fi
 
+# Command used to sign pkg repo
+export PKG_REPO_SIGNING_COMMAND=${PKG_REPO_SIGNING_COMMAND:-""}
+
 # Define base package version, based on date for snaps
 export CORE_PKG_VERSION="${PRODUCT_VERSION%%-*}${CORE_PKG_DATESTRING}"
 export CORE_PKG_PATH=${CORE_PKG_PATH:-"${SCRATCHDIR}/${PRODUCT_NAME}_${POUDRIERE_BRANCH}_${TARGET_ARCH}-core"}