From 71fa14b02464350afbedc58478c0196b9e89e04f Mon Sep 17 00:00:00 2001 From: David James Date: Wed, 11 Aug 2010 16:15:16 -0700 Subject: [PATCH] Don't install autotest bits to the image. Autotest installs stuff to the image via ssh, so there's no need to include all of this stuff to the image. This saves disk space. Note that /usr/local/autotest-chrome is currently already excluded from the image because of a hack in the chrome ebuild, and that /usr/local/autotest is usually also excluded from the image because autotest is not included as a dependency of any packages that are installed. In the factory setting, it looks like the factory has its own code for installing autotests via rsync. Presumbably, if the factory tests are managing the autotest directly, they won't want emerge mucking with the directory as well on the image. Currently, emerge doesn't muck with the same directory, but we probably want to ensure that it doesn't start doing that in future to ensure sanity. TEST=Built images. Modded for factory test. Verified that (a) build directory contains autotests, (b) regular images do not contain autotests; and (c) images modified for factory test do contain autotests Review URL: http://codereview.chromium.org/3124010 --- common.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/common.sh b/common.sh index 036f7972f5..6765c41f64 100644 --- a/common.sh +++ b/common.sh @@ -131,13 +131,15 @@ DEFAULT_INSTALL_MASK="/usr/include /usr/man /usr/share/man /usr/share/doc \ /usr/share/gtk-doc /usr/share/gtk-2.0 /usr/lib/gtk-2.0/include \ /usr/share/info /usr/share/aclocal /usr/lib/gcc /usr/lib/pkgconfig \ /usr/share/pkgconfig /usr/share/gettext /usr/share/readline /etc/runlevels \ - /usr/share/openrc /lib/rc *.a *.la /etc/init.d /usr/lib/debug" + /usr/share/openrc /lib/rc *.a *.la /etc/init.d /usr/lib/debug + /usr/local/autotest /usr/local/autotest-chrome" FACTORY_INSTALL_MASK="/opt/google/chrome /opt/google/o3d /opt/netscape \ /usr/lib/dri /usr/lib/python2.6/test /usr/share/chewing /usr/share/fonts \ /usr/share/ibus-pinyin /usr/share/libhangul /usr/share/locale \ /usr/share/m17n /usr/share/mime /usr/share/sounds /usr/share/tts \ - /usr/share/X11 /usr/share/zoneinfo /usr/lib/debug" + /usr/share/X11 /usr/share/zoneinfo /usr/lib/debug + /usr/local/autotest /usr/local/autotest-chrome" # Check to ensure not running old scripts V_REVERSE=''