From dbd615c46d88307df989e81f3083dc014d81b357 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Mon, 11 Dec 2017 15:28:36 -0200 Subject: [PATCH] Define build repo to be used during build process --- tools/builder_common.sh | 6 +++--- tools/builder_defaults.sh | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 554cba0f47..5108d35c80 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -646,7 +646,7 @@ clone_to_staging_area() { # Make sure correct repo is available on tmp dir mkdir -p ${STAGE_CHROOT_DIR}/tmp/pkg-repos setup_pkg_repo \ - ${PKG_REPO_DEFAULT} \ + ${PKG_REPO_BUILD} \ ${STAGE_CHROOT_DIR}/tmp/pkg-repos/repo.conf \ ${TARGET} \ ${TARGET_ARCH} \ @@ -1020,7 +1020,7 @@ builder_setup() { local _arch=$(uname -m) setup_pkg_repo \ - ${PKG_REPO_DEFAULT} \ + ${PKG_REPO_BUILD} \ ${PKG_REPO_PATH} \ ${_arch} \ ${_arch} \ @@ -1139,7 +1139,7 @@ pkg_bootstrap() { local _root=${1:-"${STAGE_CHROOT_DIR}"} setup_pkg_repo \ - ${PKG_REPO_DEFAULT} \ + ${PKG_REPO_BUILD} \ ${_root}${PKG_REPO_PATH} \ ${TARGET} \ ${TARGET_ARCH} \ diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index 7db896f436..3b08ffd1c7 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -308,6 +308,8 @@ export CORE_PKG_ALL_PATH="${CORE_PKG_PATH}/All" export PKG_REPO_BASE=${PKG_REPO_BASE:-"${BUILDER_TOOLS}/templates/pkg_repos"} export PFSENSE_DEFAULT_REPO="${PRODUCT_NAME}-repo-devel" export PKG_REPO_DEFAULT=${PKG_REPO_DEFAULT:-"${PKG_REPO_BASE}/${PFSENSE_DEFAULT_REPO}.conf"} +export PFSENSE_BUILD_REPO="${PFSENSE_DEFAULT_REPO}" +export PKG_REPO_BUILD=${PKG_REPO_BUILD:-"${PKG_REPO_BASE}/${PFSENSE_BUILD_REPO}.conf"} export PKG_REPO_PATH=${PKG_REPO_PATH:-"/usr/local/etc/pkg/repos/${PRODUCT_NAME}.conf"} export PRODUCT_SHARE_DIR=${PRODUCT_SHARE_DIR:-"/usr/local/share/${PRODUCT_NAME}"}