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

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

Issue 1766423002: Add multiarch specification to apt repo config. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2661
Patch Set: 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 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 307
308 if [ "$BRANDING" = "google_chrome" ]; then 308 if [ "$BRANDING" = "google_chrome" ]; then
309 source "${BUILDDIR}/installer/common/google-chrome.info" 309 source "${BUILDDIR}/installer/common/google-chrome.info"
310 else 310 else
311 source "${BUILDDIR}/installer/common/chromium-browser.info" 311 source "${BUILDDIR}/installer/common/chromium-browser.info"
312 fi 312 fi
313 eval $(sed -e "s/^\([^=]\+\)=\(.*\)$/export \1='\2'/" \ 313 eval $(sed -e "s/^\([^=]\+\)=\(.*\)$/export \1='\2'/" \
314 "${BUILDDIR}/installer/theme/BRANDING") 314 "${BUILDDIR}/installer/theme/BRANDING")
315 315
316 REPOCONFIG="http://dl.google.com/linux/${PACKAGE#google-}/rpm/stable" 316 REPOCONFIG="http://dl.google.com/linux/${PACKAGE#google-}/rpm/stable"
317 SSLREPOCONFIG="https://dl.google.com/linux/${PACKAGE#google-}/rpm/stable"
318 verify_channel 317 verify_channel
319 export USR_BIN_SYMLINK_NAME="${PACKAGE}-${CHANNEL}" 318 export USR_BIN_SYMLINK_NAME="${PACKAGE}-${CHANNEL}"
320 319
321 # Make everything happen in the OUTPUTDIR. 320 # Make everything happen in the OUTPUTDIR.
322 cd "${OUTPUTDIR}" 321 cd "${OUTPUTDIR}"
323 322
324 case "$TARGETARCH" in 323 case "$TARGETARCH" in
325 ia32 ) 324 ia32 )
326 export ARCHITECTURE="i386" 325 export ARCHITECTURE="i386"
327 stage_install_rpm 326 stage_install_rpm
328 ;; 327 ;;
329 x64 ) 328 x64 )
330 export ARCHITECTURE="x86_64" 329 export ARCHITECTURE="x86_64"
331 stage_install_rpm 330 stage_install_rpm
332 ;; 331 ;;
333 * ) 332 * )
334 echo 333 echo
335 echo "ERROR: Don't know how to build RPMs for '$TARGETARCH'." 334 echo "ERROR: Don't know how to build RPMs for '$TARGETARCH'."
336 echo 335 echo
337 exit 1 336 exit 1
338 ;; 337 ;;
339 esac 338 esac
340 339
341 do_package 340 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