faerbit/archiso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[configs/releng] Replace wget with pacman for make_core_repo()

Browse Source 
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.
* Always get a [core] package, in case of [testing] enabled.
* Now works when mirror is: Server = file:// ;)

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
This commit is contained in:
Gerardo Exequiel Pozzi 2011-08-30 23:46:56 -03:00
parent 8ea61d2b28
commit cb619dfae1
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
configs/releng/build.sh
View File

@ -121,26 +121,23 @@ make_usr_share() {
# Make [core] repository, keep "any" pkgs in a separate fs (makes more "dual-iso" friendly) # Make [core] repository, keep "any" pkgs in a separate fs (makes more "dual-iso" friendly)
make_core_repo() { make_core_repo() {
if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then 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-any
mkdir -p ${work_dir}/repo-core-${arch} mkdir -p ${work_dir}/repo-core-${arch}
pacman -Sy 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 | sed 's@^@core/@') \
<(grep -v ^# ${script_path}/core.exclude.${arch} | sort | sed 's@^@core/@'))
_urls=$(pacman -Sddp ${_pkgs})
pacman -Swdd --noconfirm ${_pkgs}
for _url in ${_urls}; do for _url in ${_urls}; do
_pkg_name=${_url##*/} _pkg_name=${_url##*/}
_cached_pkg=/var/cache/pacman/pkg/${_pkg_name} _cached_pkg=/var/cache/pacman/pkg/${_pkg_name}
_dst=${work_dir}/repo-core-${arch}/${_pkg_name} _dst=${work_dir}/repo-core-${arch}/${_pkg_name}
if [[ ! -e ${_dst} ]]; then cp ${_cached_pkg} ${_dst}
if [[ -e ${_cached_pkg} ]]; then repo-add -q ${work_dir}/repo-core-${arch}/core.db.tar.gz ${_dst}
cp -v "${_cached_pkg}" "${_dst}" if [[ ${_pkg_name} == *any.pkg.tar* ]]; then
else mv ${_dst} ${work_dir}/repo-core-any/${_pkg_name}
wget -nv "${_url}" -O "${_dst}" ln -sf ../any/${_pkg_name} ${_dst}
fi
fi
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}
ln -sf ../any/${_pkg_name} ${work_dir}/repo-core-${arch}/${_pkg_name}
fi fi
done done
: > ${work_dir}/build.${FUNCNAME} : > ${work_dir}/build.${FUNCNAME}