-
Notifications
You must be signed in to change notification settings - Fork 900
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Remove dl.google.com repository from Linux packages #1078
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm confused by this one, why not exit early like the others?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That part of the spec file also sets up the
brave-browserbinary: https://cs.chromium.org/chromium/src/chrome/installer/linux/rpm/chrome.spec.template?l=163-180&rcl=6819376c2fbd91863cb29e02b47f653d6dc8b292If we return early, we'll be breaking that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
and there's nothing else we need from DEFAULTS_FILE that should be set?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, it only contains two variables related to adding/re-adding the Chrome repo: