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

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

Issue 2271063004: Linux: Remove old installer dependency on libcurl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 3 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 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 echo "chrome/installer/linux/debian/expected_deps_x64" 286 echo "chrome/installer/linux/debian/expected_deps_x64"
287 echo 287 echo
288 exit $BAD_DIFF 288 exit $BAD_DIFF
289 fi 289 fi
290 rm -rf "$DUMMY_STAGING_DIR" 290 rm -rf "$DUMMY_STAGING_DIR"
291 291
292 # Additional dependencies not in the dpkg-shlibdeps output. 292 # Additional dependencies not in the dpkg-shlibdeps output.
293 # ca-certificates: Make sure users have SSL certificates. 293 # ca-certificates: Make sure users have SSL certificates.
294 # fonts-liberation: Make sure users have compatible fonts for viewing PDFs. 294 # fonts-liberation: Make sure users have compatible fonts for viewing PDFs.
295 # libappindicator1: Make systray icons work in Unity. 295 # libappindicator1: Make systray icons work in Unity.
296 # libcurl3: Was for NPAPI Flash. TODO(thestig): Remove?
297 # libnss3: Pull a more recent version of NSS than required by runtime linking, 296 # libnss3: Pull a more recent version of NSS than required by runtime linking,
298 # for security and stability updates in NSS. 297 # for security and stability updates in NSS.
299 # libstdc++6: For C++11 support. 298 # libstdc++6: For C++11 support.
300 # lsb-base: Implies many other dependencies. 299 # lsb-base: Implies many other dependencies.
301 # xdg-utils: For OS integration. 300 # xdg-utils: For OS integration.
302 # wget: For uploading crash reports with Breakpad. 301 # wget: For uploading crash reports with Breakpad.
303 ADDITION_DEPS="ca-certificates, fonts-liberation, libappindicator1, libcurl3, \ 302 ADDITION_DEPS="ca-certificates, fonts-liberation, libappindicator1,
304 libnss3 (>= 3.17.2), libstdc++6 (>=4.8.0), lsb-base (>=4.1), \ 303 libnss3 (>= 3.17.2), libstdc++6 (>=4.8.0), lsb-base (>=4.1), \
305 xdg-utils (>= 1.0.2), wget" 304 xdg-utils (>= 1.0.2), wget"
306 305
307 # Fix-up libnspr dependency due to renaming in Ubuntu (the old package still 306 # Fix-up libnspr dependency due to renaming in Ubuntu (the old package still
308 # exists, but it was moved to "universe" repository, which isn't installed by 307 # exists, but it was moved to "universe" repository, which isn't installed by
309 # default). 308 # default).
310 DPKG_SHLIB_DEPS=$(sed \ 309 DPKG_SHLIB_DEPS=$(sed \
311 's/\(libnspr4-0d ([^)]*)\), /\1 | libnspr4 (>= 4.9.5-0ubuntu0), /g' \ 310 's/\(libnspr4-0d ([^)]*)\), /\1 | libnspr4 (>= 4.9.5-0ubuntu0), /g' \
312 <<< $DPKG_SHLIB_DEPS) 311 <<< $DPKG_SHLIB_DEPS)
313 312
(...skipping 22 matching lines...) Expand all
336 # Only use the default REPOCONFIG if it's unset (e.g. verify_channel might have 335 # Only use the default REPOCONFIG if it's unset (e.g. verify_channel might have
337 # set it to an empty string) 336 # set it to an empty string)
338 REPOCONFIG="${REPOCONFIG-deb [arch=${ARCHITECTURE}] http://${BASEREPOCONFIG}}" 337 REPOCONFIG="${REPOCONFIG-deb [arch=${ARCHITECTURE}] http://${BASEREPOCONFIG}}"
339 # Allowed configs include optional HTTPS support and explicit multiarch 338 # Allowed configs include optional HTTPS support and explicit multiarch
340 # platforms. 339 # platforms.
341 REPOCONFIGREGEX="deb (\\\\[arch=[^]]*\\\\b${ARCHITECTURE}\\\\b[^]]*\\\\]" 340 REPOCONFIGREGEX="deb (\\\\[arch=[^]]*\\\\b${ARCHITECTURE}\\\\b[^]]*\\\\]"
342 REPOCONFIGREGEX+="[[:space:]]*) https?://${BASEREPOCONFIG}" 341 REPOCONFIGREGEX+="[[:space:]]*) https?://${BASEREPOCONFIG}"
343 stage_install_debian 342 stage_install_debian
344 343
345 do_package 344 do_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