Fix: FS#18959 - download_repos.sh does not report tcp timeouts and such
* Always use pacman cache. Previously pacman cache was used if package
already exists on it, now is also used to download pkg on it.
Finally copy all packages from cache with cp and make core.db.
* Using pacman, we can sure that package integrity is right.
Signed-off-by: Gerardo Exequiel Pozzi
---
configs/releng/build.sh | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index fa7d13c..0273aca 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -121,22 +121,18 @@ make_usr_share() {
# Make [core] repository, keep "any" pkgs in a separate fs (makes more "dual-iso" friendly)
make_core_repo() {
if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
- local _url _urls _pkg_name _cached_pkg _dst
+ local _url _urls _pkg_name _cached_pkg _dst _pkgs
mkdir -p ${work_dir}/repo-core-any
mkdir -p ${work_dir}/repo-core-${arch}
pacman -Sy
- _urls=$(pacman -Sddp $(comm -2 -3 <(pacman -Sql core | sort ) <(grep -v ^# ${script_path}/core.exclude.${arch} | sort)))
+ _pkgs=$(comm -2 -3 <(pacman -Sql core | sort ) <(grep -v ^# ${script_path}/core.exclude.${arch} | sort))
+ _urls=$(pacman -Sddp ${_pkgs})
+ pacman -Swdd --noconfirm ${_pkgs}
for _url in ${_urls}; do
_pkg_name=${_url##*/}
_cached_pkg=/var/cache/pacman/pkg/${_pkg_name}
_dst=${work_dir}/repo-core-${arch}/${_pkg_name}
- if [[ ! -e ${_dst} ]]; then
- if [[ -e ${_cached_pkg} ]]; then
- cp -v "${_cached_pkg}" "${_dst}"
- else
- wget -nv "${_url}" -O "${_dst}"
- fi
- fi
+ cp "${_cached_pkg}" "${_dst}"
repo-add -q ${work_dir}/repo-core-${arch}/core.db.tar.gz ${work_dir}/repo-core-${arch}/${_pkg_name}
if [[ ${_pkg_name} =~ any.pkg ]]; then
mv "${_dst}" ${work_dir}/repo-core-any/${_pkg_name}
--
1.7.6.1