diff options
| author | Renato Botelho <renato@netgate.com> | 2016-03-30 20:16:49 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-03-30 20:16:49 -0300 |
| commit | 1aa48975e32679eb87510a6d3337b63022417a17 (patch) | |
| tree | ba92196860272b9870e5034974abc375a977f139 /tools | |
| parent | fd466a86c832cfbbac79900817ff5e85ae9b37c3 (diff) | |
| download | pfsense-1aa48975e32679eb87510a6d3337b63022417a17.zip pfsense-1aa48975e32679eb87510a6d3337b63022417a17.tar.gz | |
Remove arch from repo path for now, poudriere cannot deal with big names
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/builder_common.sh | 2 | ||||
| -rw-r--r-- | tools/builder_defaults.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index f6d5904..39ccd3a 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -1530,7 +1530,7 @@ setup_pkg_repo() { mkdir -p $(dirname ${_target}) >/dev/null 2>&1 sed \ - -e "s/%%ARCH%%/${_arch}_${_target_arch}/" \ + -e "s/%%ARCH%%/${_target_arch}/" \ -e "s/%%GIT_REPO_BRANCH_OR_TAG%%/${_branch}/g" \ -e "s,%%PKG_REPO_SERVER%%,${PKG_REPO_SERVER},g" \ -e "s/%%PRODUCT_NAME%%/${PRODUCT_NAME}/g" \ diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index 2be4816..9e4a00f 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -305,7 +305,7 @@ esac # Define base package version, based on date for snaps export CORE_PKG_VERSION="${PRODUCT_VERSION%%-*}${CORE_PKG_DATESTRING}" -export CORE_PKG_PATH=${CORE_PKG_PATH:-"${SCRATCHDIR}/${PRODUCT_NAME}_${GIT_REPO_BRANCH_OR_TAG}_${TARGET}_${TARGET_ARCH}-core"} +export CORE_PKG_PATH=${CORE_PKG_PATH:-"${SCRATCHDIR}/${PRODUCT_NAME}_${GIT_REPO_BRANCH_OR_TAG}_${TARGET_ARCH}-core"} export CORE_PKG_REAL_PATH="${CORE_PKG_PATH}/.real_${DATESTRING}" export CORE_PKG_TMP=${CORE_PKG_TMP:-"${SCRATCHDIR}/core_pkg_tmp"} |
