Commit 4bc819a2 authored by Evangelos Foutras's avatar Evangelos Foutras Committed by Aaron Griffin
Browse files

Don't copy makepkg.conf into the chroot 



Replacing the chroot's makepkg.conf with our own prevents us
from building i686 packages in a i686 chroot on a x86_64 host.

[Aaron: Plus additional whitespace edits]

Signed-off-by: default avatarEvangelos Foutras <foutrelis@gmail.com>
Signed-off-by: default avatarAaron Griffin <aaronmgriffin@gmail.com>
parent d8374037

makechrootpkg

+2 −13
Original line number Diff line number Diff line
@@ -152,16 +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"
@@ -274,5 +264,4 @@ else 
    echo "Build complete"

fi





# vim:ft=sh:ts=4:sw=4:et: