From 0f2bafaba55ca4293a096045f151ea44d0479b77 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Thu, 7 Apr 2016 10:49:18 -0300
Subject: [PATCH] Use staging repo to install bsdinstaller on final area

---
 tools/builder_common.sh | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index b47463e664..59f3e31182 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -1721,13 +1721,26 @@ install_pkg_install_ports() {
 }
 
 install_bsdinstaller() {
+	local _params=""
+
+	# Use staging repo on RELEASE
+	if [ -n "${_IS_RELEASE}" ]; then
+		mkdir -p ${FINAL_CHROOT_DIR}/tmp/pkg-repo
+		cp -f ${STAGE_CHROOT_DIR}${PKG_REPO_PATH} \
+			${FINAL_CHROOT_DIR}/tmp/pkg-repo
+		_params="--repo-conf-dir /tmp/pkg-repo "
+	fi
+
 	echo ">>> Installing BSDInstaller in chroot (${FINAL_CHROOT_DIR})... (starting)"
-	pkg_chroot ${FINAL_CHROOT_DIR} install -f bsdinstaller
+	pkg_chroot ${FINAL_CHROOT_DIR} ${_params}install -f bsdinstaller
 	sed -i '' -e "s,%%PRODUCT_NAME%%,${PRODUCT_NAME}," \
 		  -e "s,%%PRODUCT_VERSION%%,${PRODUCT_VERSION}," \
 		  -e "s,%%ARCH%%,${TARGET}," \
 		  ${FINAL_CHROOT_DIR}/usr/local/share/dfuibe_lua/conf/pfSense.lua \
 		  ${FINAL_CHROOT_DIR}/usr/local/share/dfuibe_lua/conf/pfSense_rescue.lua
+	if [ -n "${_IS_RELEASE}" ]; then
+		rm -rf ${FINAL_CHROOT_DIR}/tmp/pkg-repo
+	fi
 	echo ">>> Installing BSDInstaller in chroot (${FINAL_CHROOT_DIR})... (finished)"
 }