Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix for 255639 and mtree fixes #912

Closed
wants to merge 7 commits into from
Closed

Fix for 255639 and mtree fixes #912

wants to merge 7 commits into from

Conversation

jlduran
Copy link
Contributor

@jlduran jlduran commented Nov 29, 2023

The main idea is to fix 255639, and clean up a bit while doing it.

cc/ @bsdimp @kevans91 @emaste

jlduran
jlduran commented Nov 30, 2023
View reviewed changes
etc/mtree/README Outdated Show resolved Hide resolved
@jlduran
Copy link
Contributor Author

jlduran commented Nov 30, 2023

Currently trying to upstream our 3 remaining patches for mtree (GNATS bin/57735), after that I'll submit a patch that syncs contrib/mtree (a preview here: jlduran#55).

I'm unsure about updating the flags in the README, probably end up adding -F freebsd9 as well (I guess it's easier than to adapt fmtree -> mtree), also tagging @brooksdavis1

Thank you.

Footnotes

  1. found in https://wiki.freebsd.org/NetBSDMtree. ↩

@bsdimp
Copy link
Member

bsdimp commented Nov 30, 2023

These changes look good to my eye. I'm not quite sure how to make this a 'approved review comment' though...

@jlduran
Copy link
Contributor Author

jlduran commented Nov 30, 2023

These changes look good to my eye. I'm not quite sure how to make this a 'approved review comment' though...

Thank you. That'll be Files changed > Review changes > Approve1
I plan to update the flags on the README file, if you have approved it once, there is no need to re-approve (frightening!, but that's how GitHub does it).

Footnotes

  1. https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-proposed-changes-in-a-pull-request ↩

@jlduran
mtree: Update mtree flags in README file
eb51ca3 
- Add -b (suppress blank lines before directories).
- The equivalent of `-i` in fmtree is `-j` in mtree (nmtree) (indent the
  output 4 spaces).
- Add `-F freebsd9` compatibility flavor (print the closing `..` at the
  end).
@jlduran
mtree: Use spaces not tabs
62a8ce0 
The indentation generated by mtree -j uses spaces, not tabs.
@jlduran
mtree: Properly sort entries
74a3bc5 
Reduce the diff with the output generated by mtree.
@jlduran
mtree: Add missing directories generated by certctl
51e2ed4 
PR:	255639
@jlduran
mtree: Add missing directories to BSD.root.dist
ac9d657 
While here, align to the output produced by mtree.
@jlduran
mtree: Sort BSD.tests.dist
2ddec56
@jlduran
mtree: Add missing directories to BSD.tests.dist
da34d25
@bsdimp
Copy link
Member

bsdimp commented Dec 28, 2023

Started a full buildworld / installworld (ditto kernel) before committing this change.... should be done soonish

freebsd-git pushed a commit that referenced this pull request Dec 28, 2023
@jlduran @bsdimp
mtree: Update mtree flags in README file
0a41a66 
- Add -b (suppress blank lines before directories).
- The equivalent of `-i` in fmtree is `-j` in mtree (nmtree) (indent the
  output 4 spaces).
- Add `-F freebsd9` compatibility flavor (print the closing `..` at the
  end).

Reviewed by: imp
Pull Request: #912
freebsd-git pushed a commit that referenced this pull request Dec 28, 2023
@jlduran @bsdimp
mtree: Use spaces not tabs
0888bac 
The indentation generated by mtree -j uses spaces, not tabs.

Reviewed by: imp
Pull Request: #912
freebsd-git pushed a commit that referenced this pull request Dec 28, 2023
@jlduran @bsdimp
mtree: Properly sort entries
20d6856 
Reduce the diff with the output generated by mtree.

Reviewed by: imp
Pull Request: #912
freebsd-git pushed a commit that referenced this pull request Dec 28, 2023
@jlduran @bsdimp
mtree: Add missing directories generated by certctl
5b7f73c 
PR: 255639
Reviewed by: imp
Pull Request: #912
freebsd-git pushed a commit that referenced this pull request Dec 28, 2023
@jlduran @bsdimp
mtree: Add missing directories to BSD.root.dist
1ed17d8 
While here, align to the output produced by mtree.

Reviewed by: imp
Pull Request: #912
freebsd-git pushed a commit that referenced this pull request Dec 28, 2023
@jlduran @bsdimp
mtree: Sort BSD.tests.dist
b8e385d 
Reviewed by: imp
Pull Request: #912
freebsd-git pushed a commit that referenced this pull request Dec 28, 2023
@jlduran @bsdimp
mtree: Add missing directories to BSD.tests.dist
b8856bd 
Reviewed by: imp
Pull Request: #912
@bsdimp bsdimp added the merged label Dec 28, 2023
@bsdimp
Copy link
Member

bsdimp commented Dec 28, 2023

landed. this tested right for me, but be on the lookout on IRC/discord/social media + email for any weird reports... this stuff seemed low risk and {build,install}{world,kernel} just worked, which is the biggest risk from this change.

@bsdimp bsdimp closed this Dec 28, 2023
@jlduran jlduran deleted the mtree-fixes branch December 28, 2023 06:43
bsdjhb pushed a commit to bsdjhb/cheribsd that referenced this pull request Mar 13, 2024
@jlduran @bsdjhb
mtree: Update mtree flags in README file
7860374 
- Add -b (suppress blank lines before directories).
- The equivalent of `-i` in fmtree is `-j` in mtree (nmtree) (indent the
  output 4 spaces).
- Add `-F freebsd9` compatibility flavor (print the closing `..` at the
  end).

Reviewed by: imp
Pull Request: freebsd/freebsd-src#912
bsdjhb pushed a commit to bsdjhb/cheribsd that referenced this pull request Mar 13, 2024
@jlduran @bsdjhb
mtree: Use spaces not tabs
be48dec 
The indentation generated by mtree -j uses spaces, not tabs.

Reviewed by: imp
Pull Request: freebsd/freebsd-src#912
bsdjhb pushed a commit to bsdjhb/cheribsd that referenced this pull request Mar 13, 2024
@jlduran @bsdjhb
mtree: Properly sort entries
244b2bc 
Reduce the diff with the output generated by mtree.

Reviewed by: imp
Pull Request: freebsd/freebsd-src#912
bsdjhb pushed a commit to bsdjhb/cheribsd that referenced this pull request Mar 13, 2024
@jlduran @bsdjhb
mtree: Add missing directories generated by certctl
5eb5f6e 
PR: 255639
Reviewed by: imp
Pull Request: freebsd/freebsd-src#912
bsdjhb pushed a commit to bsdjhb/cheribsd that referenced this pull request Mar 13, 2024
@jlduran @bsdjhb
mtree: Add missing directories to BSD.root.dist
b750e6c 
While here, align to the output produced by mtree.

Reviewed by: imp
Pull Request: freebsd/freebsd-src#912
bsdjhb pushed a commit to bsdjhb/cheribsd that referenced this pull request Mar 13, 2024
@jlduran @bsdjhb
mtree: Sort BSD.tests.dist
ec9941b 
Reviewed by: imp
Pull Request: freebsd/freebsd-src#912
bsdjhb pushed a commit to bsdjhb/cheribsd that referenced this pull request Mar 13, 2024
@jlduran @bsdjhb
mtree: Add missing directories to BSD.tests.dist
9f50ceb 
Reviewed by: imp
Pull Request: freebsd/freebsd-src#912
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
merged
Projects
None yet
Milestone
No milestone
2 participants
@jlduran @bsdimp