Page MenuHomeFreeBSD
Differential D49666

release/vm: finish fixing WITHOUT_QEMU
ClosedPublic
Actions

Authored by brooks on Apr 4 2025, 6:04 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Oct 12, 10:34 AM
Unknown Object (File)
Mon, Sep 29, 2:31 AM
Unknown Object (File)
Sat, Sep 27, 2:15 AM
Unknown Object (File)
Fri, Sep 26, 2:10 PM
Unknown Object (File)
Thu, Sep 25, 7:59 PM
Unknown Object (File)
Wed, Sep 24, 2:47 AM
Unknown Object (File)
Tue, Sep 23, 12:38 PM
Unknown Object (File)
Sep 14 2025, 6:17 AM
View All 38 Files
Subscribers
imp
jrtc27
markj

Details

Reviewers
cperciva
emaste
Commits
rG75ae454d5814: release/vm: finish fixing WITHOUT_QEMU
Summary

To support common shell patterns (test -n and -z) we want WITHOUT_QEMU
to be set and not empty in mk-vmimage.sh if it is defined at all in the
Makefile.

Fix a case I missed previously.

Reported by: cperciva
Fixes: f3a73a7055a8 ("release/vm: fix setting NO_ROOT and WITHOUT_QEMU")
Sponsored by: DARPA, AFRL

Diff Detail

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

Event Timeline

brooks created this revision.Apr 4 2025, 6:04 PM
Herald added subscribers: jrtc27, imp. · View Herald TranscriptApr 4 2025, 6:04 PM
brooks requested review of this revision.Apr 4 2025, 6:04 PM
Harbormaster completed remote builds in B63325: Diff 153157.Apr 4 2025, 6:04 PM
emaste accepted this revision.Apr 6 2025, 12:00 PM

Is f3a73a7055a8 the right hash -- maybe e6e5cd297ab4cae4995895b99c713df9cf6e8c0f? Change lgtm.

This revision is now accepted and ready to land.Apr 6 2025, 12:00 PM
brooks added a comment.Apr 7 2025, 1:25 AM
In D49666#1132660, @emaste wrote:

Is f3a73a7055a8 the right hash -- maybe e6e5cd297ab4cae4995895b99c713df9cf6e8c0f? Change lgtm.

Oops, that's the cherry pick in a CheriBSD branch...

Closed by commit rG75ae454d5814: release/vm: finish fixing WITHOUT_QEMU (authored by brooks). · Explain WhyApr 7 2025, 1:26 AM
This revision was automatically updated to reflect the committed changes.
brooks added a commit: rG75ae454d5814: release/vm: finish fixing WITHOUT_QEMU.
markj added a subscriber: markj.Apr 7 2025, 6:54 PM
markj added inline comments.
release/Makefile.vm
184

Is there a particular reason we don't pass NO_ROOT here, when we do for the cloudware images above?

brooks added inline comments.Apr 8 2025, 6:32 PM
release/Makefile.vm
184

That is a good question. Probably I didn't need it for cloudware so wasn't sure if it should go here. I suspect it should.

markj added inline comments.Apr 8 2025, 7:14 PM
release/Makefile.vm
184

I've been testing such a change and haven't run into problems so far; I'll post a patch to support NO_ROOT here too.

Revision Contents
Changeset List

PathSize
release/
2 lines

Diff 153229

View Options

release/Makefile.vm

Loading...