diff options
| author | Evangelos Foutras <foutrelis@gmail.com> | 2009-08-18 16:25:00 -0700 |
|---|---|---|
| committer | Aaron Griffin <aaronmgriffin@gmail.com> | 2009-08-18 16:25:00 -0700 |
| commit | 4bc819a20e4029a53d97cfa3cff164b3a497f7fe (patch) | |
| tree | 30d502f8ae54e28e1bfa32cf7bd1794b87b04009 /makechrootpkg | |
| parent | d837403780dbf479dc98296a3b94b7f43ae5bc35 (diff) | |
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>
Diffstat (limited to 'makechrootpkg')
| -rwxr-xr-x | makechrootpkg | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/makechrootpkg b/makechrootpkg index 06ce182..4050ec4 100755 --- a/makechrootpkg +++ b/makechrootpkg @@ -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: |