root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

disable PKGDEST temporarily

Browse source
This commit is contained in:
udeved 2014-10-09 12:57:08 +02:00
parent 391aa57035
commit 42f3594d67
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bin/build-set.in
View file

@ -83,9 +83,9 @@ else
repodir='/srv/build-repo' repodir='/srv/build-repo'
fi fi
if [[ -r /etc/makepkg.conf ]]; then # if [[ -r /etc/makepkg.conf ]]; then
source /etc/makepkg.conf # source /etc/makepkg.conf
fi # fi
pacman_conf_arch='default' pacman_conf_arch='default'

19
lib/build-api.sh
View file

@ -37,8 +37,8 @@ repo_create(){
set_pkgdir(){ set_pkgdir(){
if [[ -n ${pkgdir} ]];then if [[ -n ${pkgdir} ]];then
pkgdir=${pkgdir} pkgdir=${pkgdir}
elif [[ -n $PKGDEST ]];then # elif [[ -n $PKGDEST ]];then
pkgdir=$PKGDEST # pkgdir=$PKGDEST
else else
pkgdir='/var/cache/manjaro-tools/pkg' pkgdir='/var/cache/manjaro-tools/pkg'
prepare_dir "${pkgdir}" prepare_dir "${pkgdir}"
@ -151,12 +151,13 @@ chroot_build(){
if [[ $pkg == 'eudev' ]]; then if [[ $pkg == 'eudev' ]]; then
local blacklist=('libsystemd') temp= local blacklist=('libsystemd') temp=
pacman -Rdd "${blacklist[@]}" -r ${chrootdir}/$(get_user) --noconfirm pacman -Rdd "${blacklist[@]}" -r ${chrootdir}/$(get_user) --noconfirm
if [[ -z $PKGDEST ]];then # if [[ -z $PKGDEST ]];then
temp=$pkg # temp=$pkg
else # else
temp=$pkgdir/$pkg # temp=$pkgdir/$pkg
fi # fi
pacman -U $temp*${arch}*pkg*z -r ${chrootdir}/$(get_user) --noconfirm # pacman -U $temp*${arch}*pkg*z -r ${chrootdir}/$(get_user) --noconfirm
pacman -U *pkg*z -r ${chrootdir}/$(get_user) --noconfirm
fi fi
mv_pkg "${pkg}" mv_pkg "${pkg}"
cd .. cd ..
@ -183,7 +184,7 @@ display_settings(){
msg2 "chrootdir: ${chrootdir}" msg2 "chrootdir: ${chrootdir}"
msg2 "profiledir: ${profiledir}" msg2 "profiledir: ${profiledir}"
msg2 "pkgdir: ${pkgdir}" msg2 "pkgdir: ${pkgdir}"
msg2 "PKGDEST: ${PKGDEST}" # msg2 "PKGDEST: ${PKGDEST}"
msg2 "repodir: ${repodir}" msg2 "repodir: ${repodir}"
msg2 "pacman_conf: ${pacman_conf}" msg2 "pacman_conf: ${pacman_conf}"
msg2 "makepkg_conf: ${makepkg_conf}" msg2 "makepkg_conf: ${makepkg_conf}"