diff options
| author | Renato Botelho <renato@netgate.com> | 2016-06-27 17:36:47 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-06-27 17:36:47 -0300 |
| commit | 33306accaf76333f4da1c6e97c0c674d11c1c5bc (patch) | |
| tree | 6ad8f53c0f8f295b520b99ed57a053fd279e2bbd /tools | |
| parent | 729c0c7a0e3f5055b1175e250e7c55fd7a77bf2c (diff) | |
| download | pfsense-33306accaf76333f4da1c6e97c0c674d11c1c5bc.zip pfsense-33306accaf76333f4da1c6e97c0c674d11c1c5bc.tar.gz | |
Goodbye bsdinstaller
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/builder_common.sh | 25 |
1 files changed, 0 insertions, 25 deletions
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 |
