crosutils: Exclude Xvfb and Xnest from images.

common.sh

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Common constants for build scripts
 # This must evaluate properly for both /bin/bash and /bin/sh
 
 # All scripts should die on error unless commands are specifically excepted
 # by prefixing with '!' or surrounded by 'set +e' / 'set -e'.
 # TODO: Re-enable this once shflags is less prone to dying.
@@ skipping 111 matching lines @@
   INSIDE_CHROOT=1
 else
   INSIDE_CHROOT=0
 fi
 
 # Directory locations inside the dev chroot
 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 \
-  /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/local/autotest /usr/local/autotest-chrome"
+DEFAULT_INSTALL_MASK="
+  *.a
+  *.la
+  /etc/init.d
+  /etc/runlevels
+  /lib/rc
+  /usr/bin/Xnest

[Daniel Erat, 2010/12/21 18:49:57]

This line and the Xvfb one after it are the only functional changes.

+  /usr/bin/Xvfb
+  /usr/include
+  /usr/lib/debug
+  /usr/lib/gcc
+  /usr/lib/gtk-2.0/include
+  /usr/lib/pkgconfig
+  /usr/local/autotest
+  /usr/local/autotest-chrome
+  /usr/man
+  /usr/share/aclocal
+  /usr/share/doc
+  /usr/share/gettext
+  /usr/share/gtk-2.0
+  /usr/share/gtk-doc
+  /usr/share/info
+  /usr/share/man
+  /usr/share/openrc
+  /usr/share/pkgconfig
+  /usr/share/readline
+  "
 
-FACTORY_INSTALL_MASK="/opt/google/chrome /opt/google/o3d /opt/netscape \
-  /opt/google/talkplugin /opt/Qualcomm /opt/Synaptics \
-  /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/local/autotest /usr/local/autotest-chrome /usr/local/autotest-pkgs"
+FACTORY_INSTALL_MASK="
+  /opt/Qualcomm
+  /opt/Synaptics
+  /opt/google/chrome
+  /opt/google/o3d
+  /opt/google/talkplugin
+  /opt/netscape
+  /usr/lib/debug
+  /usr/lib/dri
+  /usr/lib/python2.6/test
+  /usr/local/autotest
+  /usr/local/autotest-chrome
+  /usr/local/autotest-pkgs
+  /usr/share/X11
+  /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/zoneinfo
+  "
 
 # Check to ensure not running old scripts
 V_REVERSE=''
 V_VIDOFF=''
 case "$(basename $0)" in
   build_image.sh|build_platform_packages.sh|customize_rootfs.sh|make_chroot.sh)
   echo
   echo "$V_REVERSE============================================================"
   echo "===========================  WARNING  ======================"
   echo "============================================================$V_VIDOFF"
@@ skipping 360 matching lines @@
 chroot_hacks_from_outside() {
   # Give args better names.
   local chroot_dir="${1}"
 
   # Add root as a sudoer if not already done.
   if ! sudo grep -q '^root ALL=(ALL) ALL$' "${chroot_dir}/etc/sudoers" ; then
     info "Upgrading old chroot (pre 2010-10-19) - adding root to sudoers"
     sudo bash -c "echo root ALL=\(ALL\) ALL >> \"${chroot_dir}/etc/sudoers\""
   fi
 }