-
Notifications
You must be signed in to change notification settings - Fork 900
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1078 from fmarier/issue1084
Remove dl.google.com repository from Linux packages
- Loading branch information
Showing
3 changed files
with
42 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| diff --git a/chrome/installer/linux/common/repo.cron b/chrome/installer/linux/common/repo.cron | ||
| index 2750e4924da6d0a723c1d649781637e7d08b3562..fbe7797e37633de174f4a83d7b11bf04b8813c1a 100755 | ||
| --- a/chrome/installer/linux/common/repo.cron | ||
| +++ b/chrome/installer/linux/common/repo.cron | ||
| @@ -17,6 +17,9 @@ | ||
| # "false" as desired. An empty $DEFAULTS_FILE is the same as setting both values | ||
| # to "false". | ||
|
|
||
| +# Don't add the Chrome repo (brave/brave-browser#1084) | ||
| +exit 0 | ||
| + | ||
| @@include@@apt.include | ||
|
|
||
| ## MAIN ## |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| diff --git a/chrome/installer/linux/common/rpmrepo.cron b/chrome/installer/linux/common/rpmrepo.cron | ||
| index f7fe2bcf7d7cbf95b23067f21f87422706c5e4d0..3541826a03009e2adb8dbd6c258d254d31247a77 100755 | ||
| --- a/chrome/installer/linux/common/rpmrepo.cron | ||
| +++ b/chrome/installer/linux/common/rpmrepo.cron | ||
| @@ -14,6 +14,9 @@ | ||
| # setting "repo_add_once" to "true" or "false" as desired. An empty | ||
| # $DEFAULTS_FILE is the same as setting the value to "false". | ||
|
|
||
| +# Don't add the Chrome repo (brave/brave-browser#1967) | ||
| +exit 0 | ||
| + | ||
| @@include@@rpm.include | ||
|
|
||
| ## MAIN ## |
14 changes: 14 additions & 0 deletions
14
patches/chrome-installer-linux-rpm-chrome.spec.template.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| diff --git a/chrome/installer/linux/rpm/chrome.spec.template b/chrome/installer/linux/rpm/chrome.spec.template | ||
| index 55a35677b9c46a2038cea9ac8dedf40d31a679f4..210f7c15ab98449f2ce121d5e7d8a7f632f5e94f 100644 | ||
| --- a/chrome/installer/linux/rpm/chrome.spec.template | ||
| +++ b/chrome/installer/linux/rpm/chrome.spec.template | ||
| @@ -127,7 +127,8 @@ if [ ! -e "$DEFAULTS_FILE" ]; then | ||
| echo 'repo_add_once="true"' > "$DEFAULTS_FILE" | ||
| fi | ||
|
|
||
| -. "$DEFAULTS_FILE" | ||
| +# Don't install the Chrome repo (brave/brave-browser#1967) | ||
| +#. "$DEFAULTS_FILE" | ||
|
|
||
| if [ "$repo_add_once" = "true" ]; then | ||
| determine_rpm_package_manager |