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

Fix creation of [core] repository

Browse Source 
* Download and add package signatures to the repository database
* Support any number of configured package caches

Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
This commit is contained in:
Pierre Schmitz 2012-06-23 10:22:53 +02:00 committed by Gerardo Exequiel Pozzi
parent e35e835e3c
commit 6c0770de06
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configs/releng/build.sh
View File

@ -168,7 +168,7 @@ 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 _pkgs local _url _urls _pkg_name _dst _pkgs _cache_dir _cache_dirs
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}
mkdir -p ${work_dir}/pacman.db/var/lib/pacman mkdir -p ${work_dir}/pacman.db/var/lib/pacman
@ -177,17 +177,27 @@ make_core_repo() {
<(grep -v ^# ${script_path}/core.exclude.${arch} | sort | sed 's@^@core/@')) <(grep -v ^# ${script_path}/core.exclude.${arch} | sort | sed 's@^@core/@'))
_urls=$(pacman -Sddp -r ${work_dir}/pacman.db ${_pkgs}) _urls=$(pacman -Sddp -r ${work_dir}/pacman.db ${_pkgs})
pacman -Swdd -r ${work_dir}/pacman.db --noprogressbar --noconfirm ${_pkgs} pacman -Swdd -r ${work_dir}/pacman.db --noprogressbar --noconfirm ${_pkgs}
_cache_dirs=($(pacman -v 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g'))
for _url in ${_urls}; do for _url in ${_urls}; do
_pkg_name=${_url##*/} _pkg_name=${_url##*/}
_cached_pkg=/var/cache/pacman/pkg/${_pkg_name}
_dst=${work_dir}/repo-core-${arch}/${_pkg_name} _dst=${work_dir}/repo-core-${arch}/${_pkg_name}
cp ${_cached_pkg} ${_dst} for _cache_dir in ${_cache_dirs[@]}; do
if [[ -e "${_cache_dir}/${_pkg_name}" ]]; then
cp "${_cache_dir}/${_pkg_name}" ${_dst}
fi
done
# download the package signature
curl -sC - -f "${_url}.sig" > "${_dst}.sig"
repo-add -q ${work_dir}/repo-core-${arch}/core.db.tar.gz ${_dst} repo-add -q ${work_dir}/repo-core-${arch}/core.db.tar.gz ${_dst}
# remove the signature file again as it is now included in the db file
rm -f "${_dst}.sig"
if [[ ${_pkg_name} == *any.pkg.tar* ]]; then if [[ ${_pkg_name} == *any.pkg.tar* ]]; then
mv ${_dst} ${work_dir}/repo-core-any/${_pkg_name} mv ${_dst} ${work_dir}/repo-core-any/${_pkg_name}
ln -sf ../any/${_pkg_name} ${_dst} ln -sf ../any/${_pkg_name} ${_dst}
fi fi
done done
# Remove old copy of db file
rm -f ${work_dir}/repo-core-${arch}/core.db.tar.gz.old
mkdir -p ${work_dir}/iso/${install_dir} mkdir -p ${work_dir}/iso/${install_dir}
pacman -Sp -r ${work_dir}/pacman.db --print-format "%r/%n-%v" ${_pkgs} | sort > ${work_dir}/iso/${install_dir}/pkglist.repo-core.${arch}.txt pacman -Sp -r ${work_dir}/pacman.db --print-format "%r/%n-%v" ${_pkgs} | sort > ${work_dir}/iso/${install_dir}/pkglist.repo-core.${arch}.txt
: > ${work_dir}/build.${FUNCNAME} : > ${work_dir}/build.${FUNCNAME}