diff --git a/bin/build-set.in b/bin/build-set.in index 75006ed..14d80de 100644 --- a/bin/build-set.in +++ b/bin/build-set.in @@ -83,9 +83,9 @@ else repodir='/srv/build-repo' fi -if [[ -r /etc/makepkg.conf ]]; then - source /etc/makepkg.conf -fi +# if [[ -r /etc/makepkg.conf ]]; then +# source /etc/makepkg.conf +# fi pacman_conf_arch='default' diff --git a/lib/build-api.sh b/lib/build-api.sh index 59f0176..4e92c92 100644 --- a/lib/build-api.sh +++ b/lib/build-api.sh @@ -37,8 +37,8 @@ repo_create(){ set_pkgdir(){ if [[ -n ${pkgdir} ]];then pkgdir=${pkgdir} - elif [[ -n $PKGDEST ]];then - pkgdir=$PKGDEST +# elif [[ -n $PKGDEST ]];then +# pkgdir=$PKGDEST else pkgdir='/var/cache/manjaro-tools/pkg' prepare_dir "${pkgdir}" @@ -151,12 +151,13 @@ chroot_build(){ if [[ $pkg == 'eudev' ]]; then local blacklist=('libsystemd') temp= pacman -Rdd "${blacklist[@]}" -r ${chrootdir}/$(get_user) --noconfirm - if [[ -z $PKGDEST ]];then - temp=$pkg - else - temp=$pkgdir/$pkg - fi - pacman -U $temp*${arch}*pkg*z -r ${chrootdir}/$(get_user) --noconfirm +# if [[ -z $PKGDEST ]];then +# temp=$pkg +# else +# temp=$pkgdir/$pkg +# fi +# pacman -U $temp*${arch}*pkg*z -r ${chrootdir}/$(get_user) --noconfirm + pacman -U *pkg*z -r ${chrootdir}/$(get_user) --noconfirm fi mv_pkg "${pkg}" cd .. @@ -183,7 +184,7 @@ display_settings(){ msg2 "chrootdir: ${chrootdir}" msg2 "profiledir: ${profiledir}" msg2 "pkgdir: ${pkgdir}" - msg2 "PKGDEST: ${PKGDEST}" +# msg2 "PKGDEST: ${PKGDEST}" msg2 "repodir: ${repodir}" msg2 "pacman_conf: ${pacman_conf}" msg2 "makepkg_conf: ${makepkg_conf}"