Linux: Use an administrative directory from Precise on Trusty for deb package builds.

chrome/installer/linux/debian/build.sh

Index: chrome/installer/linux/debian/build.sh
diff --git a/chrome/installer/linux/debian/build.sh b/chrome/installer/linux/debian/build.sh
index 2e5e061112f8853ca39b090300717a4b695be6ff..3cc35a24099fa55d71448a78d67eb12b0946771c 100755
--- a/chrome/installer/linux/debian/build.sh
+++ b/chrome/installer/linux/debian/build.sh
@@ -122,11 +122,12 @@ cleanup() {
 
 usage() {
   echo "usage: $(basename $0) [-c channel] [-a target_arch] [-o 'dir'] "
-  echo "                      [-b 'dir']"
+  echo "                      [-b 'dir'] [-d 'dir]"
   echo "-c channel the package channel (trunk, asan, unstable, beta, stable)"
   echo "-a arch    package architecture (ia32 or x64)"
   echo "-o dir     package output directory [${OUTPUTDIR}]"
   echo "-b dir     build input directory    [${BUILDDIR}]"
+  echo "-d dir     dpkg directory    [${DPKGDIR}]"
   echo "-h         this help message"
 }
 
@@ -161,7 +162,7 @@ verify_channel() {
 }
 
 process_opts() {
-  while getopts ":o:b:c:a:h" OPTNAME
+  while getopts ":o:b:c:a:d:h" OPTNAME
   do
     case $OPTNAME in
       o )
@@ -177,6 +178,9 @@ process_opts() {
       a )
         TARGETARCH="$OPTARG"
         ;;
+      d )
+        DPKGDIR="$OPTARG"
+        ;;
       h )
         usage
         exit 0
@@ -201,12 +205,15 @@ process_opts() {
 
 SCRIPTDIR=$(readlink -f "$(dirname "$0")")
 OUTPUTDIR="${PWD}"
+BUILDDIR="$(readlink -f "${SCRIPTDIR}/../../../../out/Release")"
+DPKGDIR=/var/lib/dpkg
 STAGEDIR=$(mktemp -d -t deb.build.XXXXXX) || exit 1
 TMPFILEDIR=$(mktemp -d -t deb.tmp.XXXXXX) || exit 1
 DEB_CHANGELOG="${TMPFILEDIR}/changelog"
 DEB_FILES="${TMPFILEDIR}/files"
 DEB_CONTROL="${TMPFILEDIR}/control"
 CHANNEL="trunk"
+
 # Default target architecture to same as build host.
 if [ "$(uname -m)" = "x86_64" ]; then
   TARGETARCH="x64"
@@ -216,8 +223,8 @@ fi
 
 # call cleanup() on exit
 trap cleanup 0
+
 process_opts "$@"
-BUILDDIR=${BUILDDIR:=$(readlink -f "${SCRIPTDIR}/../../../../out/Release")}
 
 source ${BUILDDIR}/installer/common/installer.include
 
@@ -261,16 +268,14 @@ touch debian/control
 # but it seems that we don't currently, so this is the most expediant fix.
 SAVE_LDLP=${LD_LIBRARY_PATH:-}
 unset LD_LIBRARY_PATH
-DPKG_SHLIB_DEPS=$(dpkg-shlibdeps -O "$BUILDDIR/chrome" | \
+DPKG_SHLIB_DEPS=$(dpkg-shlibdeps -O "$BUILDDIR/chrome" --admindir="$DPKGDIR" | \
   sed 's/^shlibs:Depends=//')
 if [ -n "$SAVE_LDLP" ]; then
   LD_LIBRARY_PATH=$SAVE_LDLP
 fi
 
 # Format it nicely and save it for comparison.
-# The grep -v is for a duplicate libc6 dep caused by Lucid glibc silliness.
-echo "$DPKG_SHLIB_DEPS" | sed 's/, /\n/g' | \
-  grep -v '^libc6 (>= 2.3.6-6~)$' > actual
+echo "$DPKG_SHLIB_DEPS" | sed 's/, /\n/g' > actual
 
 # Compare the expected dependency list to the generate list.
 BAD_DIFF=0