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

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

Issue 2395673002: Allow linux installer to be build without chrome branding (Closed)
Patch Set: . Created 4 years, 2 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/BUILD.gn ('k') | no next file » | 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 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 echo "$DPKG_SHLIB_DEPS" | sed 's/, /\n/g' | \ 275 echo "$DPKG_SHLIB_DEPS" | sed 's/, /\n/g' | \
276 grep -v '^libc6 (>= 2.3.6-6~)$' | LANG=C sort > actual 276 grep -v '^libc6 (>= 2.3.6-6~)$' | LANG=C sort > actual
277 277
278 # Compare the expected dependency list to the generate list. 278 # Compare the expected dependency list to the generate list.
279 BAD_DIFF=0 279 BAD_DIFF=0
280 diff -u "$SCRIPTDIR/expected_deps_$TARGETARCH" actual || BAD_DIFF=1 280 diff -u "$SCRIPTDIR/expected_deps_$TARGETARCH" actual || BAD_DIFF=1
281 if [ $BAD_DIFF -ne 0 ] && [ -z "${IGNORE_DEPS_CHANGES:-}" ]; then 281 if [ $BAD_DIFF -ne 0 ] && [ -z "${IGNORE_DEPS_CHANGES:-}" ]; then
282 echo 282 echo
283 echo "ERROR: Shared library dependencies changed!" 283 echo "ERROR: Shared library dependencies changed!"
284 echo "If this is intentional, please update:" 284 echo "If this is intentional, please update:"
285 echo "chrome/installer/linux/debian/expected_deps_ia32" 285 echo "chrome/installer/linux/debian/expected_deps_$TARGETARCH"
286 echo "chrome/installer/linux/debian/expected_deps_x64"
287 echo 286 echo
288 exit $BAD_DIFF 287 exit $BAD_DIFF
289 fi 288 fi
290 rm -rf "$DUMMY_STAGING_DIR" 289 rm -rf "$DUMMY_STAGING_DIR"
291 290
292 # Additional dependencies not in the dpkg-shlibdeps output. 291 # Additional dependencies not in the dpkg-shlibdeps output.
293 # ca-certificates: Make sure users have SSL certificates. 292 # ca-certificates: Make sure users have SSL certificates.
294 # fonts-liberation: Make sure users have compatible fonts for viewing PDFs. 293 # fonts-liberation: Make sure users have compatible fonts for viewing PDFs.
295 # libappindicator1: Make systray icons work in Unity. 294 # libappindicator1: Make systray icons work in Unity.
296 # libnss3: Pull a more recent version of NSS than required by runtime linking, 295 # libnss3: Pull a more recent version of NSS than required by runtime linking,
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 # Only use the default REPOCONFIG if it's unset (e.g. verify_channel might have 334 # Only use the default REPOCONFIG if it's unset (e.g. verify_channel might have
336 # set it to an empty string) 335 # set it to an empty string)
337 REPOCONFIG="${REPOCONFIG-deb [arch=${ARCHITECTURE}] http://${BASEREPOCONFIG}}" 336 REPOCONFIG="${REPOCONFIG-deb [arch=${ARCHITECTURE}] http://${BASEREPOCONFIG}}"
338 # Allowed configs include optional HTTPS support and explicit multiarch 337 # Allowed configs include optional HTTPS support and explicit multiarch
339 # platforms. 338 # platforms.
340 REPOCONFIGREGEX="deb (\\\\[arch=[^]]*\\\\b${ARCHITECTURE}\\\\b[^]]*\\\\]" 339 REPOCONFIGREGEX="deb (\\\\[arch=[^]]*\\\\b${ARCHITECTURE}\\\\b[^]]*\\\\]"
341 REPOCONFIGREGEX+="[[:space:]]*) https?://${BASEREPOCONFIG}" 340 REPOCONFIGREGEX+="[[:space:]]*) https?://${BASEREPOCONFIG}"
342 stage_install_debian 341 stage_install_debian
343 342
344 do_package 343 do_package
OLDNEW
« no previous file with comments | « chrome/installer/linux/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698