diff options
| author | Renato Botelho <renato@netgate.com> | 2016-10-26 16:16:16 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-10-26 16:17:50 -0200 |
| commit | 3e80d64e922890aa689d0cb92aaeea587df20ebb (patch) | |
| tree | a965ff07cf74966ba4342c18e0b63ca50a858ca1 /tools/builder_common.sh | |
| parent | 349b210203450a27f91be2cfdd46f4e96e912c2f (diff) | |
| download | pfsense-3e80d64e922890aa689d0cb92aaeea587df20ebb.zip pfsense-3e80d64e922890aa689d0cb92aaeea587df20ebb.tar.gz | |
Make sure we consume staging packages on build process after pfSense-repo became a package
Diffstat (limited to 'tools/builder_common.sh')
| -rw-r--r-- | tools/builder_common.sh | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 18b0773..2010f31 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -606,6 +606,15 @@ clone_to_staging_area() { # Make sure pkg is present pkg_bootstrap ${STAGE_CHROOT_DIR} + # Make sure correct repo is available on tmp dir + mkdir -p ${STAGE_CHROOT_DIR}/tmp/pkg-repos + setup_pkg_repo \ + ${PKG_REPO_DEFAULT} \ + ${STAGE_CHROOT_DIR}/tmp/pkg-repos/repo.conf \ + ${TARGET} \ + ${TARGET_ARCH} \ + staging + echo "Done!" } @@ -688,6 +697,9 @@ customize_stagearea_for_image() { ${BUILDER_TOOLS}/templates/custom_logos/${_image_variant}/*.png \ ${FINAL_CHROOT_DIR}/usr/local/share/${PRODUCT_NAME}/custom_logos fi + + # Remove temporary repo conf + rm -rf ${FINAL_CHROOT_DIR}/tmp/pkg-repos } create_distribution_tarball() { @@ -1015,7 +1027,12 @@ pkg_chroot() { /sbin/mount -t devfs devfs ${_root}/dev cp -f /etc/resolv.conf ${_root}/etc/resolv.conf touch ${BUILDER_LOGS}/install_pkg_install_ports.txt - script -aq ${BUILDER_LOGS}/install_pkg_install_ports.txt pkg -c ${_root} $@ >/dev/null 2>&1 + local _params="" + if [ -f "${_root}/tmp/pkg-repos/repo.conf" ]; then + _params="--repo-conf-dir /tmp/pkg-repos " + fi + script -aq ${BUILDER_LOGS}/install_pkg_install_ports.txt \ + pkg -c ${_root} ${_params}$@ >/dev/null 2>&1 local result=$? rm -f ${_root}/etc/resolv.conf /sbin/umount -f ${_root}/dev |
