Page MenuHomeFreeBSD

bsd.confs.mk: Support CONFGROUPS.yes
ClosedPublic

Authored by ivy on Oct 6 2025, 6:58 AM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Dec 30, 6:16 PM
Unknown Object (File)
Thu, Dec 25, 6:40 AM
Unknown Object (File)
Dec 9 2025, 6:51 AM
Unknown Object (File)
Dec 4 2025, 10:03 AM
Unknown Object (File)
Dec 1 2025, 11:16 AM
Unknown Object (File)
Nov 27 2025, 2:05 PM
Unknown Object (File)
Nov 26 2025, 3:23 PM
Unknown Object (File)
Nov 24 2025, 3:44 PM

Details

Summary

Align CONFGROUPS with other options like SUBDIRS and FILESGROUPS by
supporting the CONFGROUPS.yes option. This means logic like this:

.if ${MK_FOO} != "no"
CONFGROUPS+= FOO
.endif

can be replaced by:

CONFGROUPS.${MK_FOO}+= FOO

Use this to simplify libexec/rc/rc.d/Makefile, and while here, indent
and alphabetise the file.

MFC after: 1 week

Diff Detail

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

Event Timeline

ivy requested review of this revision.Oct 6 2025, 6:58 AM

I'd commit bsd.conf.mk as its own commot. I did this to subdirs years ago

This revision is now accepted and ready to land.Oct 6 2025, 7:26 AM
In D52923#1209241, @imp wrote:

I'd commit bsd.conf.mk as its own commot. I did this to subdirs years ago

i could split this into two commits if you insist, but i'd rather not. the changes to both files are self-contained, so it will look fine in the history.

In D52923#1209247, @ivy wrote:
In D52923#1209241, @imp wrote:

I'd commit bsd.conf.mk as its own commot. I did this to subdirs years ago

i could split this into two commits if you insist, but i'd rather not. the changes to both files are self-contained, so it will look fine in the history.

But if another file uses this construct and then we find a problem in rc.d/makefile, it becomes harder to cleanly back that out since we have to either back out more things, or do a hacky diff to revert.

remove libexec/rc/rc.d changes

This revision now requires review to proceed.Oct 8 2025, 5:47 AM
This revision is now accepted and ready to land.Oct 8 2025, 5:56 AM
This revision was automatically updated to reflect the committed changes.