diff options
| author | Travis Willard <travis@archlinux.org> | 2008-01-05 09:55:10 -0500 |
|---|---|---|
| committer | Aaron Griffin <aaronmgriffin@gmail.com> | 2008-01-23 16:11:37 -0600 |
| commit | 9e627e219e7c0e3fb3aa21fe24e056d5233f6841 (patch) | |
| tree | ec355d81f045492be482c8b5b9751bcbf3dafadf | |
| parent | 113f51fbc01155b3f2d5a66a09f3cf096662cbdc (diff) | |
| download | devtools32-9e627e219e7c0e3fb3aa21fe24e056d5233f6841.tar.xz | |
Copy makepkg.conf and ~/.makepkg.conf into chroot.
This change allows all packager-defined settings (such as PACKAGER or OPTIONS) to propogate into the chroot when building packages.
Signed-off-by: Travis Willard <travis@archlinux.org>
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
| -rwxr-xr-x | makechrootpkg | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/makechrootpkg b/makechrootpkg index cd11141..c7ce273 100755 --- a/makechrootpkg +++ b/makechrootpkg @@ -102,15 +102,20 @@ trap 'cleanup' 0 1 2 15 echo "moving build files to chroot" [ -d "$uniondir/build" ] || mkdir "$uniondir/build" -# Source makepkg.conf and ~/makepkg.conf +# Copy makepkg.conf and ~/.makepkg.conf into the chroot so packager has +# all their custom variables set. if [ -r "/etc/makepkg.conf" ]; then - source "/etc/makepkg.conf" + rm $uniondir/etc/makepkg.conf + cp /etc/makepkg.conf $uniondir/etc/makepkg.conf fi if [ -r ~/.makepkg.conf ]; then - source ~/.makepkg.conf + cat ~/.makepkg.conf >> $uniondir/etc/makepkg.conf fi -# Set up src and pkg dirs +source $uniondir/etc/makepkg.conf + +# Magic trickery with PKGDEST and SRCDEST, so that the built +# files end up where they're expected in the _real_ filesystem [ -d "$uniondir/srcdest" ] || mkdir "$uniondir/srcdest" [ -d "$uniondir/pkgdest" ] || mkdir "$uniondir/pkgdest" [ ! -z "$PKGDEST" ] && mount --bind "$PKGDEST" "$uniondir/pkgdest" |