From 5cc6cbd3af821fd6d90e72015121c27d6f6a2c01 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Fri, 18 Sep 2009 13:01:16 -0700 Subject: [PATCH] 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 4bc819a20e4029a53d97cfa3cff164b3a497f7fe by Evangelos Foutras Signed-off-by: Aaron Griffin --- makechrootpkg | 17 +++++------------ 1 files changed, 5 insertions(+), 12 deletions(-) diff --git a/makechrootpkg b/makechrootpkg index b0bbdac..839d39c 100755 --- a/makechrootpkg +++ b/makechrootpkg @@ -152,18 +152,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" @@ -234,6 +222,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 -- 1.6.4.4