From 1ba64c22602bdf5c53565083c13c67a4583e32ff Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sat, 8 Dec 2012 13:11:18 -0500
Subject: Add /usr/share/libretools/conf.sh, use /etc/libretools.d/chroot.conf

Use it for librechroot, libremakepkg, libremkchroot
---
 src/libretools.conf | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

(limited to 'src/libretools.conf')

diff --git a/src/libretools.conf b/src/libretools.conf
index 5e45350..9e17871 100644
--- a/src/libretools.conf
+++ b/src/libretools.conf
@@ -24,18 +24,6 @@ REPOS=('core' 'libre' 'extra' 'community' 'libre-testing' 'social' 'sugar' 'pcr'
 ## Used by `librestage`
 ARCHES=('i686' 'x86_64' 'mips64el' 'any')
 
-################################################################################
-# chroot                                                                       #
-################################################################################
-
-## The directory where the chroots are stored
-CHROOTDIR=/var/lib/archbuild
-## Extra packages to have installed on the chroot (besides base base-devel and sudo)
-CHROOTEXTRAPKG=(distcc ccache tsocks)
-## The meaning of this changes based on the version of libretools+devtools
-## do NOT set it to 'root'
-CHROOT=default
-
 ################################################################################
 # abslibre                                                                     #
 ################################################################################
@@ -106,6 +94,8 @@ TORUPATH=/var/lib/libretools/toru
 # This probably shouldn't be in a .conf file...                                #
 ################################################################################
 
+if [[ -n ${INCLUDE_CONF_SH:-} ]]; then
+
 LIBREUSER="${SUDO_USER:-$USER}"
 LIBREHOME="$(eval echo ~$LIBREUSER)"
 if [[ -z ${XDG_CONFIG_HOME:-} ]]; then
@@ -116,22 +106,19 @@ if [[ -e "$XDG_CONFIG_HOME/libretools/libretools.conf" ]]; then
 fi
 
 ret=0
-for VAR in CHROOTDIR CHROOT PARABOLAHOST LIBREDESTDIR \
+for VAR in PARABOLAHOST LIBREDESTDIR \
 	BLACKLIST WORKDIR REPOS ARCHES ABSLIBREGIT \
 	COMMITCMD DIFFTOOL FULLBUILDCMD SIGEXT SIGID; do
-
 	if [[ -z ${!VAR} ]]; then
 		echo "Configure $VAR var in /etc/libretools.conf"
 		ret=1
 	fi
 done
-if [[ $CHROOT == root ]]; then
-	echo "Configured var CHROOT cannot equal 'root'"
-	ret=1
-fi
 if [[ $ret != 0 ]]; then
 	exit 1
 fi
 unset ret
 
 . /usr/bin/libremessages
+
+fi
-- 
cgit v1.2.2