From adc6865b29b31a32cce195d6912af039ef7eab77 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 5 Jun 2013 20:43:01 -0600 Subject: chroot.conf: configure CHROOTEXTRAPKG to be empty by default --- src/chroot-tools/chroot.conf | 3 ++- test/librechroot-test.sh | 1 + test/libremakepkg-test.sh | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) 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() { -- cgit v1.2.3-54-g00ecf