mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure we consume staging packages on build process after pfSense-repo became a package

Browse Source
This commit is contained in:
Renato Botelho 2016-10-26 16:16:16 -02:00
parent 349b210203
commit 3e80d64e92
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tools/builder_common.sh
View File

@ -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