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: Evangelos Foutras <foutrelis@gmail.com> Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
This commit is contained in:
parent
d837403780
commit
4bc819a20e
|
@ -104,7 +104,7 @@ if [ ! -d "$chrootdir/root" ]; then
|
|||
usage
|
||||
fi
|
||||
|
||||
[ -d "$chrootdir/$LAYER" -a "$clean_first" -eq "1" ] && rm -rf "$chrootdir/$LAYER/"
|
||||
[ -d "$chrootdir/$LAYER" -a "$clean_first" -eq "1" ] && rm -rf "$chrootdir/$LAYER/"
|
||||
[ -d "$chrootdir/$LAYER" ] || mkdir "$chrootdir/$LAYER"
|
||||
[ -d "$chrootdir/union" ] || mkdir "$chrootdir/union"
|
||||
|
||||
|
@ -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"
|
||||
|
@ -272,7 +262,6 @@ if [ -e ${chrootdir}/union/build/BUILD_FAILED ]; then
|
|||
else
|
||||
rm -rf ${chrootdir}/union/build/*
|
||||
echo "Build complete"
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
# vim:ft=sh:ts=4:sw=4:et:
|
||||
|
|
Loading…
Reference in New Issue