summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-06-05 20:43:01 -0600
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-06-05 20:43:01 -0600
commitadc6865b29b31a32cce195d6912af039ef7eab77 (patch)
tree32c14b3a23369314a53ec0a3528984037c371c0d
parent7982a6af840eb8c37b3c2eed123bf4f66da8906a (diff)
chroot.conf: configure CHROOTEXTRAPKG to be empty by defaultv20130605testing-20130605
-rw-r--r--src/chroot-tools/chroot.conf3
-rw-r--r--test/librechroot-test.sh1
-rw-r--r--test/libremakepkg-test.sh1
3 files changed, 4 insertions, 1 deletions
diff --git a/src/chroot-tools/chroot.conf b/src/chroot-tools/chroot.conf
index a161a61..0e7f558 100644
--- a/src/chroot-tools/chroot.conf
+++ b/src/chroot-tools/chroot.conf
@@ -10,4 +10,5 @@ CHROOT=default
# Extra packages to have installed on the chroot.
# This is in addition to CHROOTPKG=(base-devel)
-CHROOTEXTRAPKG=(distcc ccache tsocks libretools)
+#CHROOTEXTRAPKG=(distcc ccache tsocks libretools)
+CHROOTEXTRAPKG=()
diff --git a/test/librechroot-test.sh b/test/librechroot-test.sh
index 7096e37..9dc1b7d 100644
--- a/test/librechroot-test.sh
+++ b/test/librechroot-test.sh
@@ -9,6 +9,7 @@ before() {
mkdir -p "$XDG_CONFIG_HOME"/libretools
echo "CHROOTDIR='$tmpdir'" > "$XDG_CONFIG_HOME"/libretools/chroot.conf
echo "CHROOT='default'" >> "$XDG_CONFIG_HOME"/libretools/chroot.conf
+ echo "CHROOTEXTRAPKG=()" >> "$XDG_CONFIG_HOME"/libretools/chroot.conf
}
after() {
diff --git a/test/libremakepkg-test.sh b/test/libremakepkg-test.sh
index 94249a9..8a4fa63 100644
--- a/test/libremakepkg-test.sh
+++ b/test/libremakepkg-test.sh
@@ -10,6 +10,7 @@ before() {
mkdir -p "$XDG_CONFIG_HOME"/libretools
echo "CHROOTDIR='$tmpdir/chrootdir'" > "$XDG_CONFIG_HOME"/libretools/chroot.conf
echo "CHROOT='default'" >> "$XDG_CONFIG_HOME"/libretools/chroot.conf
+ echo "CHROOTEXTRAPKG=()" >> "$XDG_CONFIG_HOME"/libretools/chroot.conf
}
after() {