diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-14 14:47:40 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-14 14:47:40 -0300 |
| commit | 43fea251e8c25e408bb0e59a2a8f0ef2c0c72a9a (patch) | |
| tree | b1c9fe70fc82ad9b4e7819fc2a1917970b3648f0 /libremakepkg | |
| parent | 55abb1e683ace68905f987bdcd452df6e709a9e8 (diff) | |
| parent | 54ba056b200a5ef141f8d589a2f45478c6bd8a6b (diff) | |
Merge branch 'master' into fauno
Diffstat (limited to 'libremakepkg')
| -rwxr-xr-x | libremakepkg | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/libremakepkg b/libremakepkg index bac9e30..292e4b5 100755 --- a/libremakepkg +++ b/libremakepkg @@ -22,6 +22,13 @@ source /etc/libretools.conf source /etc/makepkg.conf +# Local vars may differ from chroot's +LOCALPKGDEST=${PKGDEST} +LOCALSRCDEST=${SRCDEST} +LOCALSRCPKGDEST=${SRCPKGDEST} + +source ${CHROOTDIR}/${CHROOT}/etc/makepkg.conf + function usage { # Display message and exit echo 'cd to a dir containing a PKGBUILD and run:' @@ -42,10 +49,14 @@ function usage { # Display message and exit function buildenv { # Mounts *DEST from makepkg.conf msg "Building env" - for mp in ${SRCDEST} ${PKGDEST} ${SRCPKGDEST}; do - msg2 "binding ${mp} to ${CHROOTDIR}/${CHROOT}${mp}" - mkdir -p "${CHROOTDIR}/${CHROOT}${mp}" - mount -o bind ${mp} "${CHROOTDIR}/${CHROOT}${mp}" || exit 1 + for mp in SRCDEST PKGDEST SRCPKGDEST; do +# The host system directory + lmp=LOCAL${mp} + + msg2 "Binding ${!lmp} to ${CHROOTDIR}/${CHROOT}${!mp}" + + mkdir -p "${CHROOTDIR}/${CHROOT}${!mp}" + mount -o bind ${!lmp} "${CHROOTDIR}/${CHROOT}${!mp}" || exit 1 done } |