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

Unified Diff: chrome/installer/linux/debian/build.sh

Issue 1759243002: Add multiarch specification to apt repo config. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/installer/linux/common/variables.include ('k') | chrome/installer/linux/rpm/build.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/linux/debian/build.sh
diff --git a/chrome/installer/linux/debian/build.sh b/chrome/installer/linux/debian/build.sh
index bf84089ec4b71129e502c709931b7b5be7045841..5ce119b701f335f746341965717d679651ca86ad 100755
--- a/chrome/installer/linux/debian/build.sh
+++ b/chrome/installer/linux/debian/build.sh
@@ -236,8 +236,6 @@ fi
eval $(sed -e "s/^\([^=]\+\)=\(.*\)$/export \1='\2'/" \
"${BUILDDIR}/installer/theme/BRANDING")
-REPOCONFIG="deb http://dl.google.com/linux/chrome/deb/ stable main"
-SSLREPOCONFIG="deb https://dl.google.com/linux/chrome/deb/ stable main"
verify_channel
# Some Debian packaging tools want these set.
@@ -314,11 +312,9 @@ cd "${OUTPUTDIR}"
case "$TARGETARCH" in
ia32 )
export ARCHITECTURE="i386"
- stage_install_debian
;;
x64 )
export ARCHITECTURE="amd64"
- stage_install_debian
;;
* )
echo
@@ -327,5 +323,14 @@ case "$TARGETARCH" in
exit 1
;;
esac
+BASEREPOCONFIG="dl.google.com/linux/chrome/deb/ stable main"
+# Only use the default REPOCONFIG if it's unset (e.g. verify_channel might have
+# set it to an empty string)
+REPOCONFIG="${REPOCONFIG-deb [arch=${ARCHITECTURE}] http://${BASEREPOCONFIG}}"
+# Allowed configs include optional HTTPS support and explicit multiarch
+# platforms.
+REPOCONFIGREGEX="deb (\\\\[arch=[^]]*\\\\b${ARCHITECTURE}\\\\b[^]]*\\\\]" \
+"[[:space:]]*)?https?://${BASEREPOCONFIG}"
+stage_install_debian
do_package
« no previous file with comments | « chrome/installer/linux/common/variables.include ('k') | chrome/installer/linux/rpm/build.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698