diff options
| author | Renato Botelho <renato@netgate.com> | 2016-09-15 13:01:17 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-09-15 13:01:17 -0300 |
| commit | 1ca26242edd01c7568a4e42606ea3bd4e5536bd5 (patch) | |
| tree | dbd6f0bb03cd765d395544a50ed14d4f1d416825 /tools/builder_common.sh | |
| parent | 16efbe4ec7fd8ff3b0817276f6b63d91f2751458 (diff) | |
| download | pfsense-1ca26242edd01c7568a4e42606ea3bd4e5536bd5.zip pfsense-1ca26242edd01c7568a4e42606ea3bd4e5536bd5.tar.gz | |
Simplify logic and remove duplicated code
Diffstat (limited to 'tools/builder_common.sh')
| -rw-r--r-- | tools/builder_common.sh | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 0cb5eb1..a1ddb6d 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -913,22 +913,15 @@ clone_to_staging_area() { rm -rf ${SCRATCHDIR}/repo-tmp >/dev/null 2>&1 mkdir -p ${_share_repos_path} >/dev/null 2>&1 - setup_pkg_repo \ - ${PKG_REPO_DEFAULT} \ - ${_share_repos_path}/${PRODUCT_NAME}-repo.conf \ - ${TARGET} \ - ${TARGET_ARCH} - - cp -f ${PKG_REPO_DEFAULT%%.conf}.descr ${_share_repos_path} - - # Add additional repos - for _template in ${PKG_REPO_BASE}/${PRODUCT_NAME}-repo-*.conf; do + # Add all repos + for _template in ${PKG_REPO_BASE}/${PRODUCT_NAME}-repo*.conf; do _template_filename=$(basename ${_template}) setup_pkg_repo \ ${_template} \ ${_share_repos_path}/${_template_filename} \ ${TARGET} \ ${TARGET_ARCH} + cp -f ${_template%%.conf}.descr ${_share_repos_path} done |
