Unbundle dpkg-shlibdeps

chrome/installer/linux/debian/build.sh

 #!/bin/bash
 #
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # TODO(mmoss) This currently only works with official builds, since non-official
 # builds don't add the "${BUILDDIR}/installer/" files needed for packaging.
 
 set -e
@@ skipping 111 matching lines @@
 
 usage() {
   echo "usage: $(basename $0) [-c channel] [-a target_arch] [-o 'dir'] "
   echo "                      [-b 'dir'] -d branding"
   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 brand   either chromium or google_chrome"
   echo "-s dir     /path/to/sysroot"
-  echo "-e dir     /path/to/dpkg-dev"
   echo "-h         this help message"
 }
 
 # Check that the channel name is one of the allowable ones.
 verify_channel() {
   case $CHANNEL in
     stable )
       CHANNEL=stable
       RELEASENOTES="http://googlechromereleases.blogspot.com/search/label/Stable%20updates"
       ;;
@@ skipping 14 matching lines @@
     * )
       echo
       echo "ERROR: '$CHANNEL' is not a valid channel type."
       echo
       exit 1
       ;;
   esac
 }
 
 process_opts() {
-  while getopts ":e:s:o:b:c:a:d:h" OPTNAME
+  while getopts ":s:o:b:c:a:d:h" OPTNAME
   do
     case $OPTNAME in
       o )
         OUTPUTDIR=$(readlink -f "${OPTARG}")
         mkdir -p "${OUTPUTDIR}"
         ;;
       b )
         BUILDDIR=$(readlink -f "${OPTARG}")
         ;;
       c )
         CHANNEL="$OPTARG"
         ;;
       a )
         TARGETARCH="$OPTARG"
         ;;
       d )
         BRANDING="$OPTARG"
         ;;
       s )
         SYSROOT="$OPTARG"
         ;;
-      e )
-        DPKG_DEV_DIR="$OPTARG"
-        ;;
       h )
         usage
         exit 0
         ;;
       \: )
         echo "'-$OPTARG' needs an argument."
         usage
         exit 1
         ;;
       * )
@@ skipping 73 matching lines @@
 SAVE_LDLP=${LD_LIBRARY_PATH:-}
 unset LD_LIBRARY_PATH
 if [ ${TARGETARCH} = "x64" ]; then
   SHLIB_ARGS="-l${SYSROOT}/usr/lib/x86_64-linux-gnu"
   SHLIB_ARGS="${SHLIB_ARGS} -l${SYSROOT}/lib/x86_64-linux-gnu"
 else
   SHLIB_ARGS="-l${SYSROOT}/usr/lib/i386-linux-gnu"
   SHLIB_ARGS="${SHLIB_ARGS} -l${SYSROOT}/lib/i386-linux-gnu"
 fi
 SHLIB_ARGS="${SHLIB_ARGS} -l${SYSROOT}/usr/lib"
-# TODO(thomasanderson): Unbundle dpkg-shlibdeps once the Precise->Trusty
-# transition is complete by reverting CL 2411423002 and applying ps40001.
-DPKG_SHLIB_DEPS=$(cd ${SYSROOT} && DPKG_DATADIR=${DPKG_DEV_DIR} \
-  perl -I ${DPKG_DEV_DIR}/scripts ${DPKG_DEV_DIR}/scripts/dpkg-shlibdeps.pl \
-  ${SHLIB_ARGS:-} -O -e"$BUILDDIR/chrome" | sed 's/^shlibs:Depends=//')
+DPKG_SHLIB_DEPS=$(cd ${SYSROOT} && dpkg-shlibdeps ${SHLIB_ARGS:-} -O \
+                  -e"$BUILDDIR/chrome" | sed 's/^shlibs:Depends=//')
 if [ -n "$SAVE_LDLP" ]; then
   LD_LIBRARY_PATH=$SAVE_LDLP
 fi
 
 # Format it nicely and save it for comparison.
 echo "$DPKG_SHLIB_DEPS" | sed 's/, /\n/g' | LANG=C sort > actual
 
 # Compare the expected dependency list to the generated list.
 BAD_DIFF=0
 diff -u "$SCRIPTDIR/expected_deps_${TARGETARCH}_${TARGET_DISTRO}" actual || \
@@ skipping 56 matching lines @@
 # Only use the default REPOCONFIG if it's unset (e.g. verify_channel might have
 # set it to an empty string)
 REPOCONFIG="${REPOCONFIG-deb [arch=${ARCHITECTURE}] http://${BASEREPOCONFIG}}"
 # Allowed configs include optional HTTPS support and explicit multiarch
 # platforms.
 REPOCONFIGREGEX="deb (\\\\[arch=[^]]*\\\\b${ARCHITECTURE}\\\\b[^]]*\\\\]"
 REPOCONFIGREGEX+="[[:space:]]*) https?://${BASEREPOCONFIG}"
 stage_install_debian
 
 do_package