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

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

Issue 1769533003: Add multiarch specification to apt repo config. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2623
Patch Set: add fix from c9702882daa3175654319d844fee7d4c64ee468b Created 4 years, 9 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') | 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 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 281
282 if [ "$BRANDING" = "google_chrome" ]; then 282 if [ "$BRANDING" = "google_chrome" ]; then
283 source "${BUILDDIR}/installer/common/google-chrome.info" 283 source "${BUILDDIR}/installer/common/google-chrome.info"
284 else 284 else
285 source "${BUILDDIR}/installer/common/chromium-browser.info" 285 source "${BUILDDIR}/installer/common/chromium-browser.info"
286 fi 286 fi
287 eval $(sed -e "s/^\([^=]\+\)=\(.*\)$/export \1='\2'/" \ 287 eval $(sed -e "s/^\([^=]\+\)=\(.*\)$/export \1='\2'/" \
288 "${BUILDDIR}/installer/theme/BRANDING") 288 "${BUILDDIR}/installer/theme/BRANDING")
289 289
290 REPOCONFIG="http://dl.google.com/linux/${PACKAGE#google-}/rpm/stable" 290 REPOCONFIG="http://dl.google.com/linux/${PACKAGE#google-}/rpm/stable"
291 SSLREPOCONFIG="https://dl.google.com/linux/${PACKAGE#google-}/rpm/stable"
292 verify_channel 291 verify_channel
293 export USR_BIN_SYMLINK_NAME="${PACKAGE}-${CHANNEL}" 292 export USR_BIN_SYMLINK_NAME="${PACKAGE}-${CHANNEL}"
294 293
295 # Make everything happen in the OUTPUTDIR. 294 # Make everything happen in the OUTPUTDIR.
296 cd "${OUTPUTDIR}" 295 cd "${OUTPUTDIR}"
297 296
298 case "$TARGETARCH" in 297 case "$TARGETARCH" in
299 ia32 ) 298 ia32 )
300 export ARCHITECTURE="i386" 299 export ARCHITECTURE="i386"
301 stage_install_rpm 300 stage_install_rpm
302 ;; 301 ;;
303 x64 ) 302 x64 )
304 export ARCHITECTURE="x86_64" 303 export ARCHITECTURE="x86_64"
305 stage_install_rpm 304 stage_install_rpm
306 ;; 305 ;;
307 * ) 306 * )
308 echo 307 echo
309 echo "ERROR: Don't know how to build RPMs for '$TARGETARCH'." 308 echo "ERROR: Don't know how to build RPMs for '$TARGETARCH'."
310 echo 309 echo
311 exit 1 310 exit 1
312 ;; 311 ;;
313 esac 312 esac
314 313
315 do_package 314 do_package
OLDNEW
« no previous file with comments | « chrome/installer/linux/debian/build.sh ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698