From d11ce17167d744646084138dba7b2693a8879b17 Mon Sep 17 00:00:00 2001 From: Chris Masone Date: Tue, 9 Nov 2010 14:22:08 -0800 Subject: [PATCH] [crosutils] Mask out /usr/local/autotest-pkgs on install BUG=8544 TEST=build image with --factory_install, ensure that image does not have data in /usr/local/autotest-pkgs Change-Id: I5ed17d794392ec654bc122fa15f7ab8a7abbba2d Review URL: http://codereview.chromium.org/4756001 --- common.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common.sh b/common.sh index 25abd9b4c3..502a8c6c10 100644 --- a/common.sh +++ b/common.sh @@ -129,6 +129,7 @@ fi CHROOT_TRUNK_DIR="/home/$USER/trunk" # Install make for portage ebuilds. Used by build_image and gmergefs. +# TODO: Is /usr/local/autotest-chrome still used by anyone? 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 \ @@ -143,7 +144,7 @@ FACTORY_INSTALL_MASK="/opt/google/chrome /opt/google/o3d /opt/netscape \ /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/local/autotest /usr/local/autotest-chrome" + /usr/local/autotest /usr/local/autotest-chrome /usr/local/autotest-pkgs" # Check to ensure not running old scripts V_REVERSE=''