diff options
| -rwxr-xr-x | build.sh | 8 | ||||
| -rw-r--r-- | tools/builder_common.sh | 7 |
2 files changed, 12 insertions, 3 deletions
@@ -401,6 +401,12 @@ if [ -z "${_SKIP_REBUILD_PRESTAGE}" ]; then install_pkg_install_ports fi +# Create core repo +core_pkg_create_repo + +# Send core repo to staging area +pkg_repo_rsync "${CORE_PKG_PATH}" ignore_final_rsync + export DEFAULT_KERNEL=${DEFAULT_KERNEL_ISO:-"${PRODUCT_NAME}"} # XXX: Figure out why wait is failing and proper fix @@ -449,8 +455,6 @@ for _IMGTOBUILD in $_IMAGESTOBUILD; do esac done -core_pkg_create_repo - if [ -n "${_bg_pids}" ]; then if [ -n "${SNAPSHOTS}" ]; then snapshots_update_status ">>> NOTE: waiting for jobs: ${_bg_pids} to finish..." diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 8043e23..a0ced5f 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -1854,11 +1854,16 @@ finish() { pkg_repo_rsync() { local _repo_path_param="${1}" + local _ignore_final_rsync="${2}" if [ -z "${_repo_path_param}" -o ! -d "${_repo_path_param}" ]; then return fi + if [ -n "${SKIP_FINAL_RSYNC}" ]; then + _ignore_final_rsync="1" + fi + # Sanitize path _repo_path=$(realpath ${_repo_path_param}) @@ -1936,7 +1941,7 @@ pkg_repo_rsync() { print_error_pfS fi - if [ -z "${USE_PKG_REPO_STAGING}" -o -n "${SKIP_FINAL_RSYNC}" ]; then + if [ -z "${USE_PKG_REPO_STAGING}" -o -n "${_ignore_final_rsync}" ]; then return fi |
