Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(312)

Side by Side Diff: chrome/installer/linux/rpm/build.sh

Issue 2721373002: Uprev NSS requirement on Linux to 3.26 (Closed)
Patch Set: Update deps Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/installer/linux/debian/build.sh ('k') | crypto/nss_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 echo "If this is intentional, please update:" 124 echo "If this is intentional, please update:"
125 echo "chrome/installer/linux/rpm/expected_deps_i386" 125 echo "chrome/installer/linux/rpm/expected_deps_i386"
126 echo "chrome/installer/linux/rpm/expected_deps_x86_64" 126 echo "chrome/installer/linux/rpm/expected_deps_x86_64"
127 echo 127 echo
128 exit $BAD_DIFF 128 exit $BAD_DIFF
129 fi 129 fi
130 130
131 # lsb implies many dependencies. 131 # lsb implies many dependencies.
132 # 132 #
133 # nss (bundled) is optional in LSB 4.0. Also specify a more recent version 133 # nss (bundled) is optional in LSB 4.0. Also specify a more recent version
134 # for security and stability updates. 134 # for security and stability updates. While we depend on libnss3.so and not
135 # libssl3.so, force the dependency on libssl3 to ensure the NSS version is
136 # 3.28 or later, since libssl3 should always be packaged with libnss3.
135 # 137 #
136 # libstdc++.so.6 is for C++11 support. 138 # libstdc++.so.6 is for C++11 support.
137 # 139 #
138 # wget is for uploading crash reports with Breakpad. 140 # wget is for uploading crash reports with Breakpad.
139 # 141 #
140 # xdg-utils is still optional in LSB 4.0. 142 # xdg-utils is still optional in LSB 4.0.
141 # 143 #
142 # zlib may not need to be there. It should be included with LSB. 144 # zlib may not need to be there. It should be included with LSB.
143 # TODO(thestig): Figure out why there is an entry for zlib. 145 # TODO(thestig): Figure out why there is an entry for zlib.
144 # 146 #
145 # We want to depend on the system SSL certs so wget can upload crash reports 147 # We want to depend on the system SSL certs so wget can upload crash reports
146 # securely, but there's no common capability between the distros. Bugs filed: 148 # securely, but there's no common capability between the distros. Bugs filed:
147 # https://qa.mandriva.com/show_bug.cgi?id=55714 149 # https://qa.mandriva.com/show_bug.cgi?id=55714
148 # https://bugzilla.redhat.com/show_bug.cgi?id=538158 150 # https://bugzilla.redhat.com/show_bug.cgi?id=538158
149 # https://bugzilla.novell.com/show_bug.cgi?id=556248 151 # https://bugzilla.novell.com/show_bug.cgi?id=556248
150 # 152 #
151 # We want to depend on liberation-fonts as well, but there is no such package 153 # We want to depend on liberation-fonts as well, but there is no such package
152 # for Fedora. https://bugzilla.redhat.com/show_bug.cgi?id=1252564 154 # for Fedora. https://bugzilla.redhat.com/show_bug.cgi?id=1252564
153 # TODO(thestig): Use the liberation-fonts package once its available on all 155 # TODO(thestig): Use the liberation-fonts package once its available on all
154 # supported distros. 156 # supported distros.
155 DEPENDS="lsb >= 4.0, \ 157 DEPENDS="lsb >= 4.0, \
156 libnss3.so(NSS_3.19.1)${PKG_ARCH}, \ 158 libnss3.so(NSS_3.22)${PKG_ARCH}, \
159 libssl3.so(NSS_3.28)${PKG_ARCH}, \
157 libstdc++.so.6(GLIBCXX_3.4.18)${PKG_ARCH}, \ 160 libstdc++.so.6(GLIBCXX_3.4.18)${PKG_ARCH}, \
158 wget, \ 161 wget, \
159 xdg-utils, \ 162 xdg-utils, \
160 zlib, \ 163 zlib, \
161 $(echo "${DETECTED_DEPENDS}" | tr '\n' ',')" 164 $(echo "${DETECTED_DEPENDS}" | tr '\n' ',')"
162 gen_spec 165 gen_spec
163 166
164 # Create temporary rpmbuild dirs. 167 # Create temporary rpmbuild dirs.
165 RPMBUILD_DIR=$(mktemp -d -t rpmbuild.XXXXXX) || exit 1 168 RPMBUILD_DIR=$(mktemp -d -t rpmbuild.XXXXXX) || exit 1
166 mkdir -p "$RPMBUILD_DIR/BUILD" 169 mkdir -p "$RPMBUILD_DIR/BUILD"
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 ;; 331 ;;
329 * ) 332 * )
330 echo 333 echo
331 echo "ERROR: Don't know how to build RPMs for '$TARGETARCH'." 334 echo "ERROR: Don't know how to build RPMs for '$TARGETARCH'."
332 echo 335 echo
333 exit 1 336 exit 1
334 ;; 337 ;;
335 esac 338 esac
336 339
337 do_package 340 do_package
OLDNEW
« no previous file with comments | « chrome/installer/linux/debian/build.sh ('k') | crypto/nss_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698