From af9c8deafee60659b7d2898c1d30c56d1122e6d8 Mon Sep 17 00:00:00 2001
From: Daniel Erat <derat@chromium.org>
Date: Fri, 15 Jan 2010 10:09:11 -0800
Subject: [PATCH] build: Add gnupg and x11-utils to prod package list.

apt-get can't verify signatures without GPG, which
leads to devserver scripts breaking.  xwininfo and
xprop are useful for debugging X issues.

Review URL: http://codereview.chromium.org/542079
---
 install_packages.sh | 2 +-
 make_chroot.sh      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/install_packages.sh b/install_packages.sh
index 79f2810ef9..420bd14623 100755
--- a/install_packages.sh
+++ b/install_packages.sh
@@ -215,7 +215,7 @@ sudo cp /etc/hosts "${ROOT_FS_DIR}/etc"
 trap cleanup_rootfs_mounts EXIT
 
 # Install prod packages
-COMPONENTS=`cat $FLAGS_package_list | grep -v ' *#' | grep -v '^ *$' | sed '/$/{N;s/\n/ /;}'`
+COMPONENTS=`cat $FLAGS_package_list | sed -e 's/#.*//' | grep -v '^ *$' | sed '/$/{N;s/\n/ /;}'`
 sudo APT_CONFIG="$APT_CONFIG" DEBIAN_FRONTEND=noninteractive \
   apt-get --force-yes install $COMPONENTS
 
diff --git a/make_chroot.sh b/make_chroot.sh
index e4004d0187..c9bc526c86 100755
--- a/make_chroot.sh
+++ b/make_chroot.sh
@@ -45,7 +45,7 @@ eval set -- "${FLAGS_ARGV}"
 # TODO: replace shflags with something less error-prone, or contribute a fix.
 set -e
 
-COMPONENTS=`cat $FLAGS_pkglist | grep -v ' *#' | grep -v '^ *$' | tr '\n' ' '`
+COMPONENTS=`cat $FLAGS_pkglist | sed -e 's/#.*//' | grep -v '^ *$' | tr '\n' ' '`
 FULLNAME="Chrome OS dev user"
 DEFGROUPS="eng,admin,adm,dialout,cdrom,floppy,audio,dip,video"
 PASSWORD=chronos