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

Side by Side Diff: chrome/installer/linux/debian/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 | « no previous file | chrome/installer/linux/rpm/build.sh » ('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 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 # Additional dependencies not in the dpkg-shlibdeps output. 318 # Additional dependencies not in the dpkg-shlibdeps output.
319 # ca-certificates: Make sure users have SSL certificates. 319 # ca-certificates: Make sure users have SSL certificates.
320 # fonts-liberation: Make sure users have compatible fonts for viewing PDFs. 320 # fonts-liberation: Make sure users have compatible fonts for viewing PDFs.
321 # libappindicator1: Make systray icons work in Unity. 321 # libappindicator1: Make systray icons work in Unity.
322 # libnss3: Pull a more recent version of NSS than required by runtime linking, 322 # libnss3: Pull a more recent version of NSS than required by runtime linking,
323 # for security and stability updates in NSS. 323 # for security and stability updates in NSS.
324 # lsb-release: For lsb_release. 324 # lsb-release: For lsb_release.
325 # xdg-utils: For OS integration. 325 # xdg-utils: For OS integration.
326 # wget: For uploading crash reports with Breakpad. 326 # wget: For uploading crash reports with Breakpad.
327 ADDITIONAL_DEPS="ca-certificates, fonts-liberation, libappindicator1, \ 327 ADDITIONAL_DEPS="ca-certificates, fonts-liberation, libappindicator1, \
328 libnss3 (>= 3.17.2), lsb-release, xdg-utils (>= 1.0.2), wget" 328 libnss3 (>= 3.26), lsb-release, xdg-utils (>= 1.0.2), wget"
329 329
330 # Fix-up libnspr dependency due to renaming in Ubuntu (the old package still 330 # Fix-up libnspr dependency due to renaming in Ubuntu (the old package still
331 # exists, but it was moved to "universe" repository, which isn't installed by 331 # exists, but it was moved to "universe" repository, which isn't installed by
332 # default). 332 # default).
333 # TODO(thestig): This is probably no longer needed. Verify and remove. 333 # TODO(thestig): This is probably no longer needed. Verify and remove.
334 DPKG_SHLIB_DEPS=$(sed \ 334 DPKG_SHLIB_DEPS=$(sed \
335 's/\(libnspr4-0d ([^)]*)\), /\1 | libnspr4 (>= 4.9.5-0ubuntu0), /g' \ 335 's/\(libnspr4-0d ([^)]*)\), /\1 | libnspr4 (>= 4.9.5-0ubuntu0), /g' \
336 <<< $DPKG_SHLIB_DEPS) 336 <<< $DPKG_SHLIB_DEPS)
337 337
338 # Remove libnss dependency so the one in $ADDITIONAL_DEPS can supercede it. 338 # Remove libnss dependency so the one in $ADDITIONAL_DEPS can supercede it.
(...skipping 25 matching lines...) Expand all
364 # set it to an empty string) 364 # set it to an empty string)
365 REPOCONFIG="${REPOCONFIG-deb [arch=${ARCHITECTURE}] http://${BASEREPOCONFIG}}" 365 REPOCONFIG="${REPOCONFIG-deb [arch=${ARCHITECTURE}] http://${BASEREPOCONFIG}}"
366 # Allowed configs include optional HTTPS support and explicit multiarch 366 # Allowed configs include optional HTTPS support and explicit multiarch
367 # platforms. 367 # platforms.
368 REPOCONFIGREGEX="deb (\\\\[arch=[^]]*\\\\b${ARCHITECTURE}\\\\b[^]]*\\\\]" 368 REPOCONFIGREGEX="deb (\\\\[arch=[^]]*\\\\b${ARCHITECTURE}\\\\b[^]]*\\\\]"
369 REPOCONFIGREGEX+="[[:space:]]*) https?://${BASEREPOCONFIG}" 369 REPOCONFIGREGEX+="[[:space:]]*) https?://${BASEREPOCONFIG}"
370 stage_install_debian 370 stage_install_debian
371 371
372 do_package 372 do_package
373 verify_package 373 verify_package
OLDNEW
« no previous file with comments | « no previous file | chrome/installer/linux/rpm/build.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698