| OLD | NEW | 
|---|
| 1 #!/bin/bash | 1 #!/bin/bash | 
| 2 # | 2 # | 
| 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be | 
| 5 # found in the LICENSE file. | 5 # found in the LICENSE file. | 
| 6 | 6 | 
| 7 # TODO(mmoss) This currently only works with official builds, since non-official | 7 # TODO(mmoss) This currently only works with official builds, since non-official | 
| 8 # builds don't add the "${BUILDDIR}/installer/" files needed for packaging. | 8 # builds don't add the "${BUILDDIR}/installer/" files needed for packaging. | 
| 9 | 9 | 
| 10 set -e | 10 set -e | 
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 92   if [ "$ARCHITECTURE" = "x86_64" ] ; then | 92   if [ "$ARCHITECTURE" = "x86_64" ] ; then | 
| 93     local EMPTY_VERSION="()" | 93     local EMPTY_VERSION="()" | 
| 94     local PKG_ARCH="(64bit)" | 94     local PKG_ARCH="(64bit)" | 
| 95   elif [ "$ARCHITECTURE" = "i386" ] ; then | 95   elif [ "$ARCHITECTURE" = "i386" ] ; then | 
| 96     local EMPTY_VERSION="" | 96     local EMPTY_VERSION="" | 
| 97     local PKG_ARCH="" | 97     local PKG_ARCH="" | 
| 98   fi | 98   fi | 
| 99 | 99 | 
| 100   # Use find-requires script to make sure the dependencies are complete | 100   # Use find-requires script to make sure the dependencies are complete | 
| 101   # (especially libc and libstdc++ versions). | 101   # (especially libc and libstdc++ versions). | 
| 102   # - Filter out udev to avoid libudev.so.0 vs. libudev.so.1 mismatches. | 102   DETECTED_DEPENDS="$(echo "${BUILDDIR}/chrome" | /usr/lib/rpm/find-requires)" | 
| 103   DETECTED_DEPENDS="$(echo "${BUILDDIR}/chrome" | /usr/lib/rpm/find-requires | |  | 
| 104       grep -v udev)" |  | 
| 105 | 103 | 
| 106   # Compare the expected dependency list to the generated list. | 104   # Compare the expected dependency list to the generated list. | 
| 107   BAD_DIFF=0 | 105   BAD_DIFF=0 | 
| 108   diff "$SCRIPTDIR/expected_deps_$ARCHITECTURE" \ | 106   diff "$SCRIPTDIR/expected_deps_$ARCHITECTURE" \ | 
| 109       <(echo "${DETECTED_DEPENDS}") || BAD_DIFF=1 | 107       <(echo "${DETECTED_DEPENDS}") || BAD_DIFF=1 | 
| 110   if [ $BAD_DIFF -ne 0 ] && [ -z "${IGNORE_DEPS_CHANGES:-}" ]; then | 108   if [ $BAD_DIFF -ne 0 ] && [ -z "${IGNORE_DEPS_CHANGES:-}" ]; then | 
| 111     echo | 109     echo | 
| 112     echo "ERROR: Shared library dependencies changed!" | 110     echo "ERROR: Shared library dependencies changed!" | 
| 113     echo "If this is intentional, please update:" | 111     echo "If this is intentional, please update:" | 
| 114     echo "chrome/installer/linux/rpm/expected_deps_i386" | 112     echo "chrome/installer/linux/rpm/expected_deps_i386" | 
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 300     ;; | 298     ;; | 
| 301   * ) | 299   * ) | 
| 302     echo | 300     echo | 
| 303     echo "ERROR: Don't know how to build RPMs for '$TARGETARCH'." | 301     echo "ERROR: Don't know how to build RPMs for '$TARGETARCH'." | 
| 304     echo | 302     echo | 
| 305     exit 1 | 303     exit 1 | 
| 306     ;; | 304     ;; | 
| 307 esac | 305 esac | 
| 308 | 306 | 
| 309 do_package | 307 do_package | 
| OLD | NEW | 
|---|