Decrease the number of bootstrap packages in install_packages.sh.

src/scripts/install_packages.sh

 #!/bin/bash
 
 # Copyright (c) 2009 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.
 
 # Script to install packages into the target root file system.
 #
 # NOTE: This script should be called by build_image.sh. Do not run this
 # on your own unless you know what you are doing.
@@ skipping 59 matching lines @@
     local cmdline=`cat /proc/$pid/cmdline`
     echo "Killing process that has open file on our rootfs: $cmdline"
     ! sudo kill $pid  # Preceded by ! to disable ERR trap.
   done
 
   # Sometimes the volatile directory is left mounted and sometimes it is not,
   # so we precede by '!' to disable the ERR trap.
   ! sudo umount "$ROOT_FS_DIR"/lib/modules/2.6.*/volatile/ > /dev/null 2>&1
 
   sudo umount "${ROOT_FS_DIR}/proc"
-  sudo umount "${ROOT_FS_DIR}/sys"
 }
 
 # Create setup directory and copy over scripts, config files, and locally
 # built packages.
 mkdir -p "${SETUP_DIR}/local_packages"
 cp "${FLAGS_build_root}/${FLAGS_target}/local_packages"/* \
   "${SETUP_DIR}/local_packages"
 
 # Set up repository for local packages to install in the rootfs via apt-get.
 cd "$SETUP_DIR"
@@ skipping 69 matching lines @@
   # Use debootstrap, which runs maintainer scripts.
   sudo debootstrap --arch=i386 $FLAGS_suite "$ROOT_FS_DIR" "${FLAGS_server}"
 else
   # A hack-in-progress that does our own debootstrap equivalent and skips
   # maintainer scripts.
 
   # TODO: Replace with a pointer to lool's repo or maybe apt-get --download-only?
   REPO="${GCLIENT_ROOT}/repo/var/cache/make_local_repo"
 
   # The set of required packages before apt can take over.
-  # TODO: Trim this as much as possible. It is *very* picky, so be careful.
-  PACKAGES="base-files base-passwd bash bsdutils coreutils dash debconf debconf-i18n debianutils diff dpkg e2fslibs e2fsprogs findutils gcc-4.4-base grep gzip hostname initscripts insserv libacl1 libattr1 libblkid1 libc-bin libc6 libcomerr2 libdb4.7 libdbus-1-3 libgcc1 liblocale-gettext-perl libncurses5 libpam-modules libpam-runtime libpam0g libselinux1 libsepol1 libslang2 libss2 libssl0.9.8 libstdc++6 libtext-charwidth-perl libtext-iconv-perl libtext-wrapi18n-perl libudev0 libuuid1 locales login lsb-base lzma makedev mawk mount mountall ncurses-base ncurses-bin passwd perl-base procps python-minimal python2.6-minimal sed sysv-rc sysvinit-utils tar tzdata upstart util-linux zlib1g apt"
+  PACKAGES="debconf libacl1 libattr1 libc6 libgcc1 libselinux1"
+
+  # Set of packages that we need to install early so that other packages
+  # maintainer scripts can still basically run.
+  #
+  # login  - So that groupadd will work
+  # base-passwd/passwd - So that chmod and useradd/groupadd will work
+  # bash - So that scripts can run
+  # libpam-runtim/libuuid1 - Not exactly sure why
+  EXTRA_PACKAGES="base-files base-passwd bash libpam-runtime libuuid1 login passwd"
 
   # Prep the rootfs to work with dpgk and apt
   sudo mkdir -p "${ROOT_FS_DIR}/var/lib/dpkg/info"
   sudo touch "${ROOT_FS_DIR}/var/lib/dpkg/available"   \
     "${ROOT_FS_DIR}/var/lib/dpkg/diversions"           \
     "${ROOT_FS_DIR}/var/lib/dpkg/status"
   sudo mkdir -p "${ROOT_FS_DIR}/var/lib/apt/lists/partial"  \
     "${ROOT_FS_DIR}/var/lib/dpkg/updates"
 
   i=0
-  for p in $PACKAGES; do
+  for p in $PACKAGES $EXTRA_PACKAGES; do
     set +e
-    PKG=$(ls "${REPO}"/${p}*_i386.deb)
+    PKG=$(ls "${REPO}"/${p}_*_i386.deb)

[Bill Richardson, 2010/01/07 18:25:40]

This is for the target filesystem, not the chroot, right?
Shouldn't this be ${FLAGS_target} instead of i386?

     set -e
     if [ -z "$PKG" ]; then
-      PKG=$(ls "${REPO}"/${p}*_all.deb)
+      PKG=$(ls "${REPO}"/${p}_*_all.deb)
     fi
     echo "Installing package: $PKG [$i]"
     sudo "${SCRIPTS_DIR}"/dpkg_no_scripts.sh \
       --root="$ROOT_FS_DIR" --unpack "$PKG"
     i=$((i + 1))
   done
 
+  # ----- MAINTAINER SCRIPT FIXUPS -----
+
   # TODO: Remove when we stop having maintainer scripts altogether.
   sudo cp -a /dev/* "${ROOT_FS_DIR}/dev"
 
-  # ----- MAINTAINER SCRIPT FIXUPS -----
-
   # base-passwd
   sudo cp "${ROOT_FS_DIR}/usr/share/base-passwd/passwd.master" \
     "${ROOT_FS_DIR}/etc/passwd"
   sudo cp "${ROOT_FS_DIR}/usr/share/base-passwd/group.master" \
     "${ROOT_FS_DIR}/etc/group"
 
   # libpam-runtime
   # The postinst script calls pam-auth-update, which is a perl script that
   # expects to run within the targetfs. Until we fix this, we just copy
   # from the build chroot.
   sudo cp -a /etc/pam.d/common-* \
     /etc/pam.d/login             \
     /etc/pam.d/newusers          \
     /etc/pam.d/su                \
     /etc/pam.d/sudo              \
     "${ROOT_FS_DIR}/etc/pam.d/"
 
   # mawk
   sudo ln -s mawk "${ROOT_FS_DIR}/usr/bin/awk"
 
   # base-files?
   sudo touch "${ROOT_FS_DIR}/etc/fstab"
+
+  # sysv-rc needs this
+  sudo mkdir -p "${ROOT_FS_DIR}/etc/init.d"
 fi  # EXPERIMENTAL_NO_DEBOOTSTRAP
 
 
 # Set up mounts for working within the rootfs. We copy some basic
 # network information from the host so that maintainer scripts can
 # access the network as needed.
 # TODO: All of this rootfs mount stuff can be removed as soon as we stop
 # running the maintainer scripts on install.
 sudo mount -t proc proc "${ROOT_FS_DIR}/proc"
-sudo mount -t sysfs sysfs "${ROOT_FS_DIR}/sys" # TODO: Do we need sysfs?
 sudo cp /etc/hosts "${ROOT_FS_DIR}/etc"
 trap cleanup_rootfs_mounts EXIT
 
-# Make sure that apt is ready to work.
+# Make sure that apt is ready to work. We use --fix-broken to trigger apt
+# to install additional critical packages. If there are any of these, we
+# disable the maintainer scripts so they install ok.
 sudo APT_CONFIG="$APT_CONFIG" DEBIAN_FRONTEND=noninteractive apt-get update
-
-# TODO: We found that apt-get install --fix-broken is needed. It removes some
-# -dev packages and we need to allow it to run maintainer scripts for now.
-TMP_FORCE_DPKG="-o=Dir::Bin::dpkg=/usr/bin/dpkg"
+TMP_FORCE_NO_SCRIPTS="-o=Dir::Bin::dpkg=${SCRIPTS_DIR}/dpkg_no_scripts.sh"
 sudo APT_CONFIG="$APT_CONFIG" DEBIAN_FRONTEND=noninteractive \
-  apt-get $TMP_FORCE_DPKG --force-yes -f install
+  apt-get $TMP_FORCE_NO_SCRIPTS --force-yes --fix-broken install
 
 # Install prod packages
 COMPONENTS=`cat $FLAGS_package_list | grep -v ' *#' | grep -v '^ *$' | sed '/$/{N;s/\n/ /;}'`
 sudo APT_CONFIG="$APT_CONFIG" DEBIAN_FRONTEND=noninteractive \
   apt-get --force-yes install $COMPONENTS
 
 # Create kernel installation configuration to suppress warnings,
 # install the kernel in /boot, and manage symlinks.
 cat <<EOF | sudo dd of="${ROOT_FS_DIR}/etc/kernel-img.conf"
 link_in_boot = yes
@@ skipping 18 matching lines @@
 sudo rm -rf "$APT_CACHE_DIR"
 
 # List all packages installed so far, since these are what the local
 # repository needs to contain.
 # TODO: Replace with list_installed_packages.sh when it is fixed up.
 dpkg --root="${ROOT_FS_DIR}" -l > \
   "${OUTPUT_DIR}/package_list_installed.txt"
 
 cleanup_rootfs_mounts
 trap - EXIT