Roll Linux reference build to official build 31.0.1650.34 (trunk r224845, branch r230433)

chrome_linux/installer/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
 if [ "$VERBOSE" ]; then
   set -x
 fi
 set -u
 
 # Create the Debian changelog file needed by dpkg-gencontrol. This just adds a
 # placeholder change, indicating it is the result of an automatic build.
 # TODO(mmoss) Release packages should create something meaningful for a
 # changelog, but simply grabbing the actual 'svn log' is way too verbose. Do we
 # have any type of "significant/visible changes" log that we could use for this?
 gen_changelog() {
   rm -f "${DEB_CHANGELOG}"
   process_template "${SCRIPTDIR}/changelog.template" "${DEB_CHANGELOG}"
   debchange -a --nomultimaint -m --changelog "${DEB_CHANGELOG}" \
     "Release Notes: ${RELEASENOTES}"
-  # Trunk packages need to install to a custom path and with custom filenames
-  # (e.g. not /usr/bin/google-chrome) so they don't conflict with release
-  # channel packages.
-  if [ "$CHANNEL" = "trunk" ] || [ "$CHANNEL" = "asan" ]; then
-    local PACKAGE="${PACKAGE}-${CHANNEL}"
-  fi
-  GZLOG="${STAGEDIR}/usr/share/doc/${PACKAGE}/changelog.gz"
+  GZLOG="${STAGEDIR}/usr/share/doc/${PACKAGE}-${CHANNEL}/changelog.gz"
   mkdir -p "$(dirname "${GZLOG}")"
   gzip -9 -c "${DEB_CHANGELOG}" > "${GZLOG}"
   chmod 644 "${GZLOG}"
 }
 
 # Create the Debian control file needed by dpkg-deb.
 gen_control() {
   dpkg-gencontrol -v"${VERSIONFULL}" -c"${DEB_CONTROL}" -l"${DEB_CHANGELOG}" \
   -f"${DEB_FILES}" -p"${PACKAGE}-${CHANNEL}" -P"${STAGEDIR}" \
   -O > "${STAGEDIR}/DEBIAN/control"
   rm -f "${DEB_CONTROL}"
 }
 
 # Setup the installation directory hierachy in the package staging area.
 prep_staging_debian() {
   prep_staging_common
   install -m 755 -d "${STAGEDIR}/DEBIAN" \
     "${STAGEDIR}/etc/cron.daily" \
     "${STAGEDIR}/usr/share/menu" \
     "${STAGEDIR}/usr/share/doc/${PACKAGE}"
 }
 
 # Put the package contents in the staging area.
 stage_install_debian() {
-  # Trunk packages need to install to a custom path and with custom filenames
-  # (e.g. not /usr/bin/google-chrome) so they don't conflict with release
-  # channel packages.
-  if [ "$CHANNEL" = "trunk" ] || [ "$CHANNEL" = "asan" ]; then
-    local PACKAGE="${PACKAGE}-${CHANNEL}"
-    local INSTALLDIR="${INSTALLDIR}-${CHANNEL}"
+  # Always use a different name for /usr/bin symlink depending on channel.
+  # First, to avoid file collisions. Second, to make it possible to
+  # use update-alternatives for /usr/bin/google-chrome.
+  local USR_BIN_SYMLINK_NAME="${PACKAGE}-${CHANNEL}"
+
+  if [ "$CHANNEL" != "stable" ]; then
     # This would ideally be compiled into the app, but that's a bit too
     # intrusive of a change for these limited use channels, so we'll just hack
     # it into the wrapper script. The user can still override since it seems to
     # work to specify --user-data-dir multiple times on the command line, with
     # the last occurrence winning.
-    local DEFAULT_FLAGS="--user-data-dir=\"\${HOME}/.config/${PACKAGE}\""
+    local SXS_USER_DATA_DIR="\${XDG_CONFIG_HOME:-\${HOME}/.config}/${PACKAGE}-${CHANNEL}"
+    local DEFAULT_FLAGS="--user-data-dir=\"${SXS_USER_DATA_DIR}\""
+
+    # Avoid file collisions between channels.
+    # TODO(phajdan.jr): Do that for all packages for SxS,
+    # http://crbug.com/38598 .
+    # We can't do this for now for all packages because of
+    # http://crbug.com/295103 , and ultimately http://crbug.com/22703 .
+    # Also see https://groups.google.com/a/chromium.org/d/msg/chromium-dev/DBEqOORaRiw/pE0bNI6h0kcJ .
+    if [ "$CHANNEL" = "trunk" ] || [ "$CHANNEL" = "asan" ]; then
+      local PACKAGE="${PACKAGE}-${CHANNEL}"
+      local INSTALLDIR="${INSTALLDIR}-${CHANNEL}"
+    fi
+
+    # Make it possible to distinguish between menu entries
+    # for different channels.
     local MENUNAME="${MENUNAME} (${CHANNEL})"
   fi
   prep_staging_debian
   stage_install_common
   echo "Staging Debian install files in '${STAGEDIR}'..."
   install -m 755 -d "${STAGEDIR}/${INSTALLDIR}/cron"
   process_template "${BUILDDIR}/installer/common/repo.cron" \
       "${STAGEDIR}/${INSTALLDIR}/cron/${PACKAGE}"
   chmod 755 "${STAGEDIR}/${INSTALLDIR}/cron/${PACKAGE}"
   pushd "${STAGEDIR}/etc/cron.daily/"
@@ skipping 148 matching lines @@
 VERSIONFULL="${VERSION}-${PACKAGE_RELEASE}"
 
 if [ "$CHROMIUM_BUILD" = "_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")
 
-REPOCONFIG="deb http://dl.google.com/linux/${PACKAGE#google-}/deb/ stable main"
+REPOCONFIG="deb http://dl.google.com/linux/chrome/deb/ stable main"
 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
@@ skipping 75 matching lines @@
     ;;
   * )
     echo
     echo "ERROR: Don't know how to build DEBs for '$TARGETARCH'."
     echo
     exit 1
     ;;
 esac
 
 do_package