diff options
| author | thestig <thestig@chromium.org> | 2015-06-08 20:18:18 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-09 03:19:01 +0000 |
| commit | 155b052b66e3cca0717dacf03bd4859e49ebdb0b (patch) | |
| tree | 54770f2f21a5d5d62f4797422b8dc526951a544e /chrome/installer/linux | |
| parent | e2d44aeeb051bf75827b51a1d4881ced7be5e891 (diff) | |
| download | chromium_src-155b052b66e3cca0717dacf03bd4859e49ebdb0b.zip chromium_src-155b052b66e3cca0717dacf03bd4859e49ebdb0b.tar.gz chromium_src-155b052b66e3cca0717dacf03bd4859e49ebdb0b.tar.bz2 | |
Revert of Revert of Linux: Update RPM installer dependencies. (patchset #1 id:1 of https://codereview.chromium.org/1163183002/)
Reason for revert:
The ffmpeg static linking CL landed again.
Original issue's description:
> Revert of Linux: Update RPM installer dependencies. (patchset #1 id:1 of https://codereview.chromium.org/1146053008/)
>
> Reason for revert:
> The ffmpeg static linking CL got reverted.
>
> Original issue's description:
> > Linux: Update RPM installer dependencies.
> >
> > BUG=496904
> > TBR=zea@chromium.org
> >
> > Committed: https://crrev.com/05c12d7e804c3d1c04027c229fc534c1f0a361ac
> > Cr-Commit-Position: refs/heads/master@{#332950}
>
> TBR=zea@chromium.org
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=496904
>
> Committed: https://crrev.com/b1f08cc7a4c2b41196582ba4845de605c7b3fe64
> Cr-Commit-Position: refs/heads/master@{#333005}
TBR=zea@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=496904
Review URL: https://codereview.chromium.org/1169813003
Cr-Commit-Position: refs/heads/master@{#333433}
Diffstat (limited to 'chrome/installer/linux')
| -rw-r--r-- | chrome/installer/linux/rpm/expected_deps_i386 | 1 | ||||
| -rw-r--r-- | chrome/installer/linux/rpm/expected_deps_x86_64 | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/chrome/installer/linux/rpm/expected_deps_i386 b/chrome/installer/linux/rpm/expected_deps_i386 index 00900a9..2875d40 100644 --- a/chrome/installer/linux/rpm/expected_deps_i386 +++ b/chrome/installer/linux/rpm/expected_deps_i386 @@ -13,6 +13,7 @@ libc.so.6(GLIBC_2.2) libc.so.6(GLIBC_2.2.3) libc.so.6(GLIBC_2.3) libc.so.6(GLIBC_2.3.2) +libc.so.6(GLIBC_2.3.4) libc.so.6(GLIBC_2.4) libc.so.6(GLIBC_2.6) libc.so.6(GLIBC_2.7) diff --git a/chrome/installer/linux/rpm/expected_deps_x86_64 b/chrome/installer/linux/rpm/expected_deps_x86_64 index f7085e2..9ffd93b 100644 --- a/chrome/installer/linux/rpm/expected_deps_x86_64 +++ b/chrome/installer/linux/rpm/expected_deps_x86_64 @@ -8,6 +8,7 @@ libc.so.6()(64bit) libc.so.6(GLIBC_2.11)(64bit) libc.so.6(GLIBC_2.2.5)(64bit) libc.so.6(GLIBC_2.3.2)(64bit) +libc.so.6(GLIBC_2.3.4)(64bit) libc.so.6(GLIBC_2.3)(64bit) libc.so.6(GLIBC_2.4)(64bit) libc.so.6(GLIBC_2.6)(64bit) |