sort OptionalObsoleteFiles blocks #896
Closed
Conversation
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
|
A quick look suggests this is sane. |
Using sort(1) order makes verification of the sort easier.
Presumably these were under MK_CDDL at some point, but these days src.opts.mk takes care of setting them to "no" when MK_CDDL is.
These used to be grouped with MK_GCOV option or the like.
Options should be in sort order by primary option (usually, but not always first in the if statement).
brooksdavis
force-pushed
the
oof-cleanup
branch
from
f2d1844
to
0ded3b0
Compare
I've added a comment to document the order (it's unfortunately awkward to enforce mechnically). |
emaste
reviewed
Nov 14, 2023
| OLD_FILES+=usr/share/examples/dma/mailer.conf | ||
| OLD_DIRS+=usr/share/examples/dma | ||
|
|
||
| .if ${MK_DMAGENT} == no |
There was a problem hiding this comment.
The old file doesn't have superfluous whitespace, and the new one doesn't seem to have either...
There was a problem hiding this comment.
I really don't know what's going on here. There aren't any changes to these DMA lines, but git insists on displaying things this way.
netchild
approved these changes
Nov 14, 2023
netchild
approved these changes
Nov 14, 2023
netchild
approved these changes
Nov 14, 2023
netchild
approved these changes
Nov 14, 2023
netchild
approved these changes
Nov 14, 2023
emaste
approved these changes
Nov 14, 2023
freebsd-git
pushed a commit
that referenced
this pull request
Nov 14, 2023
Using sort(1) order makes verification of the sort easier. Reviewed by: emaste, imp, netchild Pull Request: #896
freebsd-git
pushed a commit
that referenced
this pull request
Nov 14, 2023
Reviewed by: emaste, imp, netchild Pull Request: #896
freebsd-git
pushed a commit
that referenced
this pull request
Nov 14, 2023
Presumably these were under MK_CDDL at some point, but these days src.opts.mk takes care of setting them to "no" when MK_CDDL is. Reviewed by: emaste, imp, netchild Pull Request: #896
freebsd-git
pushed a commit
that referenced
this pull request
Nov 14, 2023
Reviewed by: emaste, imp, netchild Pull Request: #896
freebsd-git
pushed a commit
that referenced
this pull request
Nov 14, 2023
These used to be grouped with MK_GCOV option or the like. Reviewed by: emaste, imp, netchild Pull Request: #896
freebsd-git
pushed a commit
that referenced
this pull request
Nov 14, 2023
Reviewed by: emaste, imp, netchild Pull Request: #896
freebsd-git
pushed a commit
that referenced
this pull request
Nov 14, 2023
Reviewed by: emaste, imp, netchild Pull Request: #896
freebsd-git
pushed a commit
that referenced
this pull request
Nov 14, 2023
Options should be in sort(1) order by primary option (usually, but not always, first in the if statement). Reviewed by: emaste, imp, netchild Pull Request: #896
bsdjhb
pushed a commit
to bsdjhb/cheribsd
that referenced
this pull request
Mar 2, 2024
Using sort(1) order makes verification of the sort easier. Reviewed by: emaste, imp, netchild Pull Request: freebsd/freebsd-src#896
bsdjhb
pushed a commit
to bsdjhb/cheribsd
that referenced
this pull request
Mar 2, 2024
Reviewed by: emaste, imp, netchild Pull Request: freebsd/freebsd-src#896
bsdjhb
pushed a commit
to bsdjhb/cheribsd
that referenced
this pull request
Mar 2, 2024
Presumably these were under MK_CDDL at some point, but these days src.opts.mk takes care of setting them to "no" when MK_CDDL is. Reviewed by: emaste, imp, netchild Pull Request: freebsd/freebsd-src#896
bsdjhb
pushed a commit
to bsdjhb/cheribsd
that referenced
this pull request
Mar 2, 2024
Reviewed by: emaste, imp, netchild Pull Request: freebsd/freebsd-src#896
bsdjhb
pushed a commit
to bsdjhb/cheribsd
that referenced
this pull request
Mar 2, 2024
These used to be grouped with MK_GCOV option or the like. Reviewed by: emaste, imp, netchild Pull Request: freebsd/freebsd-src#896
bsdjhb
pushed a commit
to bsdjhb/cheribsd
that referenced
this pull request
Mar 2, 2024
Reviewed by: emaste, imp, netchild Pull Request: freebsd/freebsd-src#896
bsdjhb
pushed a commit
to bsdjhb/cheribsd
that referenced
this pull request
Mar 2, 2024
Reviewed by: emaste, imp, netchild Pull Request: freebsd/freebsd-src#896
bsdjhb
pushed a commit
to bsdjhb/cheribsd
that referenced
this pull request
Mar 2, 2024
Options should be in sort(1) order by primary option (usually, but not always, first in the if statement). Reviewed by: emaste, imp, netchild Pull Request: freebsd/freebsd-src#896
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
OptionalObsoleteFiles.inc was almost, but not quite sorted which made it hard to figure out where to put things. There seems to have been a mix of more sorting errors, things that didn't move when the option controlling them changed, and odd choices for locations.
I've broken this up into a set of commits moving one or two blocks at a time in hopes that if people have merge difficulty they will be able to merge individual changes where it's easy to see what the conflict is.