Project

General

Profile

« Previous | Next » 

Revision b74f5074

Added by Renato Botelho over 9 years ago

Use staging repo to install bsdinstaller on final area

View differences:

tools/builder_common.sh
1721 1721
}
1722 1722

  
1723 1723
install_bsdinstaller() {
1724
	local _params=""
1725

  
1726
	# Use staging repo on RELEASE
1727
	if [ -n "${_IS_RELEASE}" ]; then
1728
		mkdir -p ${FINAL_CHROOT_DIR}/tmp/pkg-repo
1729
		cp -f ${STAGE_CHROOT_DIR}${PKG_REPO_PATH} \
1730
			${FINAL_CHROOT_DIR}/tmp/pkg-repo
1731
		_params="--repo-conf-dir /tmp/pkg-repo "
1732
	fi
1733

  
1724 1734
	echo ">>> Installing BSDInstaller in chroot (${FINAL_CHROOT_DIR})... (starting)"
1725
	pkg_chroot ${FINAL_CHROOT_DIR} install -f bsdinstaller
1735
	pkg_chroot ${FINAL_CHROOT_DIR} ${_params}install -f bsdinstaller
1726 1736
	sed -i '' -e "s,%%PRODUCT_NAME%%,${PRODUCT_NAME}," \
1727 1737
		  -e "s,%%PRODUCT_VERSION%%,${PRODUCT_VERSION}," \
1728 1738
		  -e "s,%%ARCH%%,${TARGET}," \
1729 1739
		  ${FINAL_CHROOT_DIR}/usr/local/share/dfuibe_lua/conf/pfSense.lua \
1730 1740
		  ${FINAL_CHROOT_DIR}/usr/local/share/dfuibe_lua/conf/pfSense_rescue.lua
1741
	if [ -n "${_IS_RELEASE}" ]; then
1742
		rm -rf ${FINAL_CHROOT_DIR}/tmp/pkg-repo
1743
	fi
1731 1744
	echo ">>> Installing BSDInstaller in chroot (${FINAL_CHROOT_DIR})... (finished)"
1732 1745
}
1733 1746

  

Also available in: Unified diff