summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Ismael Haase Hernández <hahj87@gmail.com>2011-08-16 00:50:43 -0500
committerJoshua Ismael Haase Hernández <hahj87@gmail.com>2011-08-16 00:50:43 -0500
commit2936ee619794c7075842b79eeab88fc690990802 (patch)
treee1d2c158f81b788cc71e539ad2c6fb3080005d03
parent8addb9ec51a7df7f35a0271ef0cc8b523d82213b (diff)
parent2c4723526c438253a3a55bc80fff08b3e42fd3e1 (diff)
Merge branch 'master' of gitpar:libretoolsspeculation-20110825
-rw-r--r--cleansystem2
-rwxr-xr-xlibrechroot4
-rwxr-xr-xlibremakepkg12
-rw-r--r--libretools.conf8
4 files changed, 14 insertions, 12 deletions
diff --git a/cleansystem b/cleansystem
index a27643b..5c44d17 100644
--- a/cleansystem
+++ b/cleansystem
@@ -57,6 +57,7 @@ libedit
libfetch
libgcrypt
libgpg-error
+libgssglue
libldap
libmpc
libnl
@@ -65,6 +66,7 @@ libpipeline
libretools
libretools
libsasl
+libtirpc
libtool
libusb
libusb-compat
diff --git a/librechroot b/librechroot
index 8071ca9..d3e02f1 100755
--- a/librechroot
+++ b/librechroot
@@ -27,7 +27,7 @@ function usage {
echo "Usage: $0 chrootname"
echo "Change to a chroot in $CHROOTDIR. Use it as root."
echo
- echo "Default chroot name: $CHCOPY"
+ echo "Default chroot name: $CHROOT"
}
while getopts 'h' arg; do
@@ -45,7 +45,7 @@ custom_config=${XDG_CONFIG_HOME}/libretools/libretools.conf
[[ -e ${custom_config} ]] && source ${custom_config}
# Enter the chroot copy by default
-chrootname=${1:-$CHCOPY}
+chrootname=${1:-$CHROOT}
CACHEDIR=${CACHEDIR:-/var/cache/pacman/pkg}
[[ ! -d ${CHROOTDIR}/${chrootname} ]] && {
diff --git a/libremakepkg b/libremakepkg
index f9f7316..ef72526 100755
--- a/libremakepkg
+++ b/libremakepkg
@@ -33,7 +33,7 @@ function usage { # Display message and exit
echo ' -h show this message.'
echo ' -c cleans the chroot before building.'
echo ' -u updates the chroot before building.'
- echo ' -n use this dir instead of "${CHCOPY}".'
+ echo ' -n use this dir instead of "${CHROOT}".'
echo ' -M <--arg> passes long args to makepkg, use it as many times as needed.'
echo
exit 1
@@ -43,9 +43,9 @@ function buildenv { # Mounts *DEST from makepkg.conf
msg "Building env"
for mp in ${SRCDEST} ${PKGDEST} ${SRCPKGDEST}; do
- msg2 "binding ${mp} to ${CHROOTDIR}/${CHCOPY}${mp}"
- mkdir -p "${CHROOTDIR}/${CHCOPY}${mp}"
- mount -o bind ${mp} "${CHROOTDIR}/${CHCOPY}${mp}" || exit 1
+ msg2 "binding ${mp} to ${CHROOTDIR}/${CHROOT}${mp}"
+ mkdir -p "${CHROOTDIR}/${CHROOT}${mp}"
+ mount -o bind ${mp} "${CHROOTDIR}/${CHROOT}${mp}" || exit 1
done
}
@@ -91,7 +91,7 @@ function trap_exit { # End inmediately but print a useful message
# args are treated as part of the message
for mp in ${SRCDEST} ${PKGDEST} ${SRCPKGDEST}; do
- umount "${CHROOTDIR}/${CHCOPY}${mp}"
+ umount "${CHROOTDIR}/${CHROOT}${mp}"
done
copy_log
@@ -111,7 +111,7 @@ CLEAN_FIRST="n"
CLEAN_CACHE=""
UPDATE_FIRST="n"
USE_LOG='n'
-CHROOTNAME=${CHCOPY}
+CHROOTNAME=${CHROOT}
MAKEPKG_ARGS=""
libremakepkgargs='hcuUn:I:M:' # libremakepkg own args
diff --git a/libretools.conf b/libretools.conf
index bf7ef05..c6a8245 100644
--- a/libretools.conf
+++ b/libretools.conf
@@ -18,10 +18,10 @@ ARCHES=('i686' 'x86_64' 'mips64el' 'any')
## The directory where the chroots are stored
CHROOTDIR=/home/chroot
-## The main chroot
+## The working chroot
+# A chroot is useful to build packages isolated from the current system and avoid
+# unwanted (as in not in dependencies) automatic library linking
CHROOT=root
-## The working copy
-CHCOPY=root
## Obtains CacheDir from pacman.conf
CACHEDIR=`grep "^#\?CacheDir" /etc/pacman.conf | cut -d'=' -f2`
@@ -62,7 +62,7 @@ TORUPATH=/var/lib/libretools/toru
# Checks if vars aren't empty
-for VAR in CHROOTDIR CHROOT CHCOPY CACHEDIR PARABOLAHOST LIBREDESTDIR \
+for VAR in CHROOTDIR CHROOT CACHEDIR PARABOLAHOST LIBREDESTDIR \
BLACKLIST WORKDIR PATCHDIR REPOS ARCHES ABSLIBREGIT \
COMMITCMD DIFFTOOL FULLBUILDCMD; do