From 33306accaf76333f4da1c6e97c0c674d11c1c5bc Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Mon, 27 Jun 2016 17:36:47 -0300
Subject: Goodbye bsdinstaller

---
 tools/builder_common.sh | 25 -------------------------
 1 file changed, 25 deletions(-)

(limited to 'tools')

diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index 57231ae..f805480 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -1153,7 +1153,6 @@ customize_stagearea_for_image() {
 	     "${_image_type}" = "memstick" -o \
 	     "${_image_type}" = "memstickserial" -o \
 	     "${_image_type}" = "memstickadi" ]; then
-		install_bsdinstaller
 		mkdir -p ${FINAL_CHROOT_DIR}/pkgs
 		cp ${CORE_PKG_ALL_PATH}/*default-config*.txz ${FINAL_CHROOT_DIR}/pkgs
 	fi
@@ -1622,30 +1621,6 @@ install_pkg_install_ports() {
 	echo "Done!"
 }
 
-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} ${_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)"
-}
-
 staginareas_clean_each_run() {
 	echo -n ">>> Cleaning build directories: "
 	if [ -d "${FINAL_CHROOT_DIR}" ]; then
-- 
cgit v1.1