Page MenuHomeFreeBSD

release: Consistently use variables for invoking certain tools
ClosedPublic

Authored by bnovkov on Jun 25 2025, 9:55 AM.
Tags
None
Referenced Files
F132377151: D51039.id157590.diff
Thu, Oct 16, 9:04 AM
F132321530: D51039.id157669.diff
Wed, Oct 15, 9:24 PM
F132321529: D51039.id157743.diff
Wed, Oct 15, 9:24 PM
F132321525: D51039.id157668.diff
Wed, Oct 15, 9:24 PM
F132321524: D51039.id.diff
Wed, Oct 15, 9:24 PM
F132321519: D51039.id157589.diff
Wed, Oct 15, 9:24 PM
F132321518: D51039.id158609.diff
Wed, Oct 15, 9:24 PM
Unknown Object (File)
Wed, Oct 15, 11:04 AM
Subscribers

Details

Summary

This change cleans up the inconsistent ways of invoking makefs and mkimg
by making sure that these tools are invoked through their corresponding
variables. This was previously only used in a few amd64 and arm64 release
scripts.

Sponsored by: Klara, Inc.
Sponsored by: The FreeBSD Foundation

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

Remove stray Makefile.firecracker change.

This revision is now accepted and ready to land.Jun 25 2025, 3:36 PM
markj added inline comments.
release/amd64/make-memstick.sh
16

Are you sure the path is right? $scriptdir is /usr/src/release/amd64. It looks like this should be ${scriptdir}/../scripts/tools.subr. Note that install-boot.sh lives outside of the release dir.

Address @markj 's comments - fix include path

This revision now requires review to proceed.Jun 26 2025, 3:14 PM
bnovkov added inline comments.
release/amd64/make-memstick.sh
16

whoops, that's a silly mistake, thanks for catching this!

bnovkov marked an inline comment as done.

Correct include path in vmimage.subr

release/tools/vmimage.subr
9

I think this one is still wrong, since tools.subr lives in scripts/ and not tools/. (Though the distinction between the two is not really clear to me.)

markj added inline comments.
release/tools/vmimage.subr
9
This revision is now accepted and ready to land.Jul 9 2025, 4:22 PM
This revision was automatically updated to reflect the committed changes.
bnovkov marked an inline comment as done.