[buildpkg] clean up
This commit is contained in:
commit
5222a70183
2 changed files with 2 additions and 8 deletions
|
@ -151,15 +151,14 @@ done
|
|||
|
||||
if [[ "${arch}" == 'multilib' ]]; then
|
||||
pacman_conf_arch='multilib'
|
||||
base_packages+=('multilib-devel')
|
||||
# TODO: protest against polluting a chroot with mesa
|
||||
base_packages+=('multilib-devel' 'lib32-mesa')
|
||||
work_dir=${chroots_pkg}/${branch}/${arch}
|
||||
cache_dir_pkg=${cache_dir}/${branch}/${arch}
|
||||
arch='x86_64'
|
||||
#is_multilib=true
|
||||
else
|
||||
work_dir=${chroots_pkg}/${branch}/${arch}
|
||||
cache_dir_pkg=${cache_dir}/${branch}/${arch}
|
||||
#is_multilib=false
|
||||
fi
|
||||
|
||||
pacman_conf="${PKGDATADIR}/pacman-${pacman_conf_arch}.conf"
|
||||
|
|
|
@ -56,10 +56,6 @@ blacklist_pkg(){
|
|||
done
|
||||
}
|
||||
|
||||
# set_mhwd_multilib(){
|
||||
# chroot-run $1/root mhwd-gpu --setgl mesa
|
||||
# }
|
||||
|
||||
prepare_cachedir(){
|
||||
prepare_dir "${cache_dir_pkg}"
|
||||
chown -R "${OWNER}:users" "${cache_dir_pkg}"
|
||||
|
@ -97,7 +93,6 @@ make_pkg(){
|
|||
for p in ${blacklist_trigger[@]}; do
|
||||
[[ $1 == $p ]] && blacklist_pkg "${work_dir}"
|
||||
done
|
||||
# ${is_multilib} && set_mhwd_multilib "${work_dir}"
|
||||
setarch "${arch}" \
|
||||
mkchrootpkg ${mkchrootpkg_args[*]} -- ${makepkg_args[*]} || eval "$2"
|
||||
source PKGBUILD
|
||||
|
|
Loading…
Reference in a new issue