Page MenuHomeFreeBSD
Differential D38447

depend-cleanup.sh: Simplify the logic, and clean bootstrap tools.
ClosedPublic
Actions

Authored by des on Feb 8 2023, 8:47 PM.
Tags
None
Referenced Files
F135260912: D38447.id116819.diff
Sat, Nov 8, 2:01 AM
Unknown Object (File)
Tue, Nov 4, 1:01 AM
Unknown Object (File)
Sat, Oct 25, 12:44 PM
Unknown Object (File)
Fri, Oct 17, 11:18 PM
Unknown Object (File)
Tue, Oct 14, 7:17 PM
Unknown Object (File)
Fri, Oct 10, 1:53 PM
Unknown Object (File)
Fri, Oct 10, 7:12 AM
Unknown Object (File)
Fri, Oct 10, 1:19 AM
View All Files
Subscribers
jhb

Details

Reviewers
emaste
imp
kevans
Commits
rG82fcae46051c: depend-cleanup.sh: Simplify the logic, and clean bootstrap tools.
rG0dfaefa97547: depend-cleanup.sh: Simplify the logic, and clean bootstrap tools.
Summary
  • There's no need to check if the file exists before grepping it; if it does not exist, grep will fail, which is what we want. Just redirect the error message to /dev/null.
  • There's no need to split the .o and .pico cases; the bodies are identical, so combine the conditions. Use a glob to avoid a false negative if one exists but not the other.
  • Also run depend-cleanup.sh on the bootstrap build tree. This unbreaks the build after 29c5f8bf9a01.

Sponsored by: Klara, Inc.
Sponsored by: NetApp, Inc.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 49645
Build 46535: arc lint + arc unit

Event Timeline

des requested review of this revision.Feb 8 2023, 8:47 PM
des created this revision.
Harbormaster completed remote builds in B49633: Diff 116802.Feb 8 2023, 8:47 PM
des added a comment.Feb 8 2023, 8:48 PM

I'm not 100% sure hardcoding tmp/obj-tools here is the best approach; perhaps we should simply run depend-cleanup.sh with OBJTOP=${WORLDTMP} before building bootstrap tools?

imp accepted this revision.Feb 8 2023, 8:49 PM
This revision is now accepted and ready to land.Feb 8 2023, 8:49 PM
des updated this revision to Diff 116806.Feb 8 2023, 8:57 PM

Remove unnecessary line continuations.

This revision now requires review to proceed.Feb 8 2023, 8:57 PM
Harbormaster completed remote builds in B49634: Diff 116806.Feb 8 2023, 8:57 PM
emaste added a subscriber: jhb.EditedFeb 8 2023, 8:58 PM

perhaps we should simply run depend-cleanup.sh with OBJTOP=${WORLDTMP} before building bootstrap tools?

Yeah, I think we should do that (or at least have the knowledge of what WORLDTMP is limited to Makefile.inc* rather than here).

FWIW the duplicated case was introduced in 838a061417300

des updated this revision to Diff 116819.Feb 8 2023, 9:56 PM

Instead of hardcoding knowledge of tmp/obj-tools into depend-cleanup.sh, run it twice.

Harbormaster completed remote builds in B49645: Diff 116819.Feb 8 2023, 9:56 PM
des edited the summary of this revision. (Show Details)Feb 8 2023, 10:09 PM
imp accepted this revision.Feb 8 2023, 10:53 PM

Oh, I like this.

This revision is now accepted and ready to land.Feb 8 2023, 10:53 PM
emaste accepted this revision.Feb 8 2023, 10:55 PM
Closed by commit rG0dfaefa97547: depend-cleanup.sh: Simplify the logic, and clean bootstrap tools. (authored by des). · Explain WhyFeb 8 2023, 10:59 PM
This revision was automatically updated to reflect the committed changes.
des added a commit: rG0dfaefa97547: depend-cleanup.sh: Simplify the logic, and clean bootstrap tools..
brooks added a commit: rG82fcae46051c: depend-cleanup.sh: Simplify the logic, and clean bootstrap tools..Dec 9 2024, 9:49 PM

Revision Contents
Changeset List

PathSize
3 lines
tools/
build/
14 lines

Diff 116819

View Options

Makefile.inc1

Loading...
View Options

tools/build/depend-cleanup.sh

Loading...