Commit 92a83232 authored by Aaron Griffin's avatar Aaron Griffin
Browse files

Revert "Don't copy makepkg.conf into the chroot" 



This reverts commit 4bc819a2.

Temporary revert until we get this sorted out

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

makechrootpkg

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

fi	





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