diff options
| author | Renato Botelho <renato@netgate.com> | 2016-06-21 07:19:52 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-06-21 07:20:22 -0300 |
| commit | 91039db4eb50b79a49ad8f02d66dfa006d7508ba (patch) | |
| tree | ae495a850b2aeb2378dcc405aadae73e3f75d91f /tools/builder_common.sh | |
| parent | 5cc9858ed86b4f55ef11685836236c427c5da932 (diff) | |
| download | pfsense-91039db4eb50b79a49ad8f02d66dfa006d7508ba.zip pfsense-91039db4eb50b79a49ad8f02d66dfa006d7508ba.tar.gz | |
Use synlink path for core repo and fix resume build
Diffstat (limited to 'tools/builder_common.sh')
| -rw-r--r-- | tools/builder_common.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index b87e267..be31093 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -83,7 +83,7 @@ core_pkg_create_repo() { # Use the same directory structure as poudriere does to avoid # breaking snapshot repositories during rsync ln -sf $(basename ${CORE_PKG_REAL_PATH}) ${CORE_PKG_PATH}/.latest - ln -sf .latest/All ${CORE_PKG_PATH}/All + ln -sf .latest/All ${CORE_PKG_ALL_PATH} ln -sf .latest/digests.txz ${CORE_PKG_PATH}/digests.txz ln -sf .latest/meta.txz ${CORE_PKG_PATH}/meta.txz ln -sf .latest/packagesite.txz ${CORE_PKG_PATH}/packagesite.txz @@ -245,7 +245,7 @@ build_all_kernels() { print_error_pfS fi - if [ -n "${NO_BUILDKERNEL}" -a -f "${CORE_PKG_REAL_PATH}/All/$(get_pkg_name kernel-${KERNEL_NAME}).txz" ]; then + if [ -n "${NO_BUILDKERNEL}" -a -f "${CORE_PKG_ALL_PATH}/$(get_pkg_name kernel-${KERNEL_NAME}).txz" ]; then echo ">>> NO_BUILDKERNEL set, skipping build" | tee -a ${LOGFILE} continue fi @@ -297,10 +297,10 @@ install_default_kernel() { fi mkdir -p $FINAL_CHROOT_DIR/pkgs if [ -z "${2}" -o -n "${INSTALL_EXTRA_KERNELS}" ]; then - cp ${CORE_PKG_REAL_PATH}/All/$(get_pkg_name kernel-${KERNEL_NAME}).txz $FINAL_CHROOT_DIR/pkgs + cp ${CORE_PKG_ALL_PATH}/$(get_pkg_name kernel-${KERNEL_NAME}).txz $FINAL_CHROOT_DIR/pkgs if [ -n "${INSTALL_EXTRA_KERNELS}" ]; then for _EXTRA_KERNEL in $INSTALL_EXTRA_KERNELS; do - _EXTRA_KERNEL_PATH=${CORE_PKG_REAL_PATH}/All/$(get_pkg_name kernel-${_EXTRA_KERNEL}).txz + _EXTRA_KERNEL_PATH=${CORE_PKG_ALL_PATH}/$(get_pkg_name kernel-${_EXTRA_KERNEL}).txz if [ -f "${_EXTRA_KERNEL_PATH}" ]; then echo -n ". adding ${_EXTRA_KERNEL_PATH} on image /pkgs folder" cp ${_EXTRA_KERNEL_PATH} $FINAL_CHROOT_DIR/pkgs @@ -1154,7 +1154,7 @@ customize_stagearea_for_image() { "${_image_type}" = "memstickadi" ]; then install_bsdinstaller mkdir -p ${FINAL_CHROOT_DIR}/pkgs - cp ${CORE_PKG_REAL_PATH}/All/*default-config*.txz ${FINAL_CHROOT_DIR}/pkgs + cp ${CORE_PKG_ALL_PATH}/*default-config*.txz ${FINAL_CHROOT_DIR}/pkgs fi pkg_chroot_add ${FINAL_CHROOT_DIR} ${_default_config} @@ -1575,12 +1575,12 @@ pkg_chroot_add() { print_error_pfS fi - if [ ! -f ${CORE_PKG_REAL_PATH}/All/${_pkg} ]; then + if [ ! -f ${CORE_PKG_ALL_PATH}/${_pkg} ]; then echo ">>> ERROR: Package ${_pkg} not found" print_error_pfS fi - cp ${CORE_PKG_REAL_PATH}/All/${_pkg} ${_target} + cp ${CORE_PKG_ALL_PATH}/${_pkg} ${_target} pkg_chroot ${_target} add /${_pkg} rm -f ${_target}/${_pkg} } |
