Chromium Code Reviews| Index: chrome/installer/linux/debian/build.sh |
| diff --git a/chrome/installer/linux/debian/build.sh b/chrome/installer/linux/debian/build.sh |
| index 174768432c0272e8a529778aa6dbda08829570e7..b91731e6c6740ae48c4e7a0fb951e9ff79e47a49 100755 |
| --- a/chrome/installer/linux/debian/build.sh |
| +++ b/chrome/installer/linux/debian/build.sh |
| @@ -217,6 +217,14 @@ if [ "$(uname -m)" = "x86_64" ]; then |
| else |
| TARGETARCH="ia32" |
| fi |
| +if [[ "$(lsb_release -c)" == *"precise" ]]; then |
|
Lei Zhang
2016/10/06 20:41:29
Single equal?
Tom (Use chromium acct)
2016/10/06 22:53:41
Done.
|
| + HOSTENVIRONMENT="precise" |
|
Sam Clegg
2016/10/06 20:26:24
Perhaps call this DISTRO or RELEASE or LSB_RELEASE
Lei Zhang
2016/10/06 20:41:29
Or at least HOST_ENVIRONMENT?
Tom (Use chromium acct)
2016/10/06 22:53:41
Done.
|
| +elif [[ "$(lsb_release -c)" == *"trusty" ]]; then |
| + HOSTENVIRONMENT="trusty" |
| +else |
| + echo "Debian package can only be build on Ubuntu Precise or Trusty" |
| + exit 1 |
| +fi |
| # call cleanup() on exit |
| trap cleanup 0 |
| @@ -277,13 +285,16 @@ echo "$DPKG_SHLIB_DEPS" | sed 's/, /\n/g' | \ |
| # Compare the expected dependency list to the generate list. |
| BAD_DIFF=0 |
| -diff -u "$SCRIPTDIR/expected_deps_$TARGETARCH" actual || BAD_DIFF=1 |
| +diff -u "$SCRIPTDIR/expected_deps_${TARGETARCH}_${HOSTENVIRONMENT}" 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" |
| - echo "chrome/installer/linux/debian/expected_deps_x64" |
| + 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 |