From 1ca26242edd01c7568a4e42606ea3bd4e5536bd5 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Thu, 15 Sep 2016 13:01:17 -0300 Subject: [PATCH] Simplify logic and remove duplicated code --- tools/builder_common.sh | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 0cb5eb1e7c..a1ddb6dff9 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