Commit 71a6d2c8 authored by Aaron Griffin's avatar Aaron Griffin
Browse files

Attempted fix for SRCDEST/PKGDEST parsing 



- Do *not* overwrite the makepkg.conf in the chroot
- Source global makepkg configs for SRCDEST and PKGDEST

Original commit 4bc819a2
by Evangelos Foutras <foutrelis@gmail.com>

Signed-off-by: default avatarAaron Griffin <aaronmgriffin@gmail.com>
parent 3b383b50

makechrootpkg

+5 −12
Original line number Diff line number Diff line
@@ -150,18 +150,6 @@ if [ "$REPACK" != "1" ]; then 
    rm -rf "$uniondir/build/"*

fi



# Copy makepkg.conf and ~/.makepkg.conf into the chroot so packager has

# all their custom variables set.

if [ -r "/etc/makepkg.conf" ]; then

  rm $uniondir/etc/makepkg.conf

  cp /etc/makepkg.conf $uniondir/etc/makepkg.conf

fi

if [ -r ~/.makepkg.conf ]; then

  cat ~/.makepkg.conf >> $uniondir/etc/makepkg.conf

fi



source $uniondir/etc/makepkg.conf



[ -d "$uniondir/pkgdest" ] || mkdir "$uniondir/pkgdest"

if ! grep "PKGDEST=/pkgdest" "$uniondir/etc/makepkg.conf" >/dev/null 2>&1; then

    echo "Setting PKGDEST in makepkg.conf"
@@ -232,6 +220,11 @@ EOF 
chmod +x "$uniondir/chrootbuild"



if mkarchroot -r "/chrootbuild" "$uniondir"; then



    # Source global makepkg.conf for SRCDEST and PKGDEST vars

    [ -f /etc/makepkg.conf ] && source /etc/makepkg.conf

    [ -f ~/.makepkg.conf ] && source ~/.makepkg.conf



    source ${WORKDIR}/PKGBUILD



    for _pkgname in ${pkgname[@]}; do