Revert of Linux build: Use sysroot when calculating dependencies

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 110 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 ":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 16 matching lines @@
 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"
 else
   TARGETARCH="ia32"
 fi
+if [[ "$(lsb_release -c)" = *"precise" ]]; then
+  HOST_DISTRO="precise"
+elif [[ "$(lsb_release -c)" = *"trusty" ]]; then
+  HOST_DISTRO="trusty"
+else
+  echo "Debian package can only be build on Ubuntu Precise or Trusty"
+  exit 1
+fi
 
 # call cleanup() on exit
 trap cleanup 0
 process_opts "$@"
 BUILDDIR=${BUILDDIR:=$(readlink -f "${SCRIPTDIR}/../../../../out/Release")}
 
-if [[ "$(basename ${SYSROOT})" = "debian_wheezy_"*"-sysroot" ]]; then
-  TARGET_DISTRO="wheezy"
-elif [[ "$(basename ${SYSROOT})" = "debian_jessie_"*"-sysroot" ]]; then
-  TARGET_DISTRO="jessie"
-else
-  echo "Debian package can only be built using the wheezy or jessie sysroot."
-  exit 1
-fi
-
 source ${BUILDDIR}/installer/common/installer.include
 
 get_version_info
 VERSIONFULL="${VERSION}-${PACKAGE_RELEASE}"
 
 if [ "$BRANDING" = "google_chrome" ]; then
   source "${BUILDDIR}/installer/common/google-chrome.info"
 else
   source "${BUILDDIR}/installer/common/chromium-browser.info"
 fi
 eval $(sed -e "s/^\([^=]\+\)=\(.*\)$/export \1='\2'/" \
   "${BUILDDIR}/installer/theme/BRANDING")
 
 verify_channel
 
 # Some Debian packaging tools want these set.
 export DEBFULLNAME="${MAINTNAME}"
 export DEBEMAIL="${MAINTMAIL}"
 
 # We'd like to eliminate more of these deps by relying on the 'lsb' package, but
 # that brings in tons of unnecessary stuff, like an mta and rpm. Until that full
 # 'lsb' package is installed by default on DEB distros, we'll have to stick with
 # the LSB sub-packages, to avoid pulling in all that stuff that's not installed
 # by default.
 
+# Need a dummy debian/control file for dpkg-shlibdeps.
+DUMMY_STAGING_DIR="${TMPFILEDIR}/dummy_staging"
+mkdir "$DUMMY_STAGING_DIR"
+cd "$DUMMY_STAGING_DIR"
+mkdir debian
+touch debian/control
+
 # Generate the dependencies,
 # TODO(mmoss): This is a workaround for a problem where dpkg-shlibdeps was
 # resolving deps using some of our build output shlibs (i.e.
 # out/Release/lib.target/libfreetype.so.6), and was then failing with:
 #   dpkg-shlibdeps: error: no dependency information found for ...
 # It's not clear if we ever want to look in LD_LIBRARY_PATH to resolve deps,
 # but it seems that we don't currently, so this is the most expediant fix.
 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=$(dpkg-shlibdeps -O "$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
+# 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~)$' | LANG=C sort > actual
 
-# Compare the expected dependency list to the generated list.
+# Compare the expected dependency list to the generate list.
 BAD_DIFF=0
-diff -u "$SCRIPTDIR/expected_deps_${TARGETARCH}_${TARGET_DISTRO}" actual || \
+diff -u "$SCRIPTDIR/expected_deps_${TARGETARCH}_${HOST_DISTRO}" actual || \
   BAD_DIFF=1
 if [ $BAD_DIFF -ne 0 ] && [ -z "${IGNORE_DEPS_CHANGES:-}" ]; then
   echo
   echo "ERROR: Shared library dependencies changed!"
   echo "If this is intentional, please update:"
-  echo "chrome/installer/linux/debian/expected_deps_ia32_jessie"
-  echo "chrome/installer/linux/debian/expected_deps_ia32_wheezy"
-  echo "chrome/installer/linux/debian/expected_deps_x64_jessie"
-  echo "chrome/installer/linux/debian/expected_deps_x64_wheezy"
+  echo "chrome/installer/linux/debian/expected_deps_ia32_precise"
+  echo "chrome/installer/linux/debian/expected_deps_ia32_trusty"
+  echo "chrome/installer/linux/debian/expected_deps_x64_precise"
+  echo "chrome/installer/linux/debian/expected_deps_x64_trusty"
   echo
   exit $BAD_DIFF
 fi
+rm -rf "$DUMMY_STAGING_DIR"
 
 # Additional dependencies not in the dpkg-shlibdeps output.
 # ca-certificates: Make sure users have SSL certificates.
 # fonts-liberation: Make sure users have compatible fonts for viewing PDFs.
 # libappindicator1: Make systray icons work in Unity.
 # libnss3: Pull a more recent version of NSS than required by runtime linking,
 #          for security and stability updates in NSS.
 # libstdc++6: For C++11 support.
 # lsb-base: Implies many other dependencies.
 # xdg-utils: For OS integration.
@@ skipping 34 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