diff options
| author | Aaron Griffin <aaronmgriffin@gmail.com> | 2009-09-18 13:01:16 -0700 |
|---|---|---|
| committer | Aaron Griffin <aaronmgriffin@gmail.com> | 2009-09-18 14:04:02 -0700 |
| commit | 71a6d2c89587da5299b5a6c00542f49a1325721b (patch) | |
| tree | 36feb5c7294cc3dec524d546ee969224598900f3 | |
| parent | 3b383b50fc8a140f0a8ba93ed7f72dfa72462f89 (diff) | |
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 <foutrelis@gmail.com>
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
| -rwxr-xr-x | makechrootpkg | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/makechrootpkg b/makechrootpkg index 5640be2..2b71707 100755 --- a/makechrootpkg +++ b/makechrootpkg @@ -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 |