Differential D52923

bsd.confs.mk: Support CONFGROUPS.yes
ClosedPublic
Actions

Authored by ivy on Mon, Oct 6, 6:58 AM.

Details

Reviewers

imp

Group Reviewers

pkgbase

Commits

rGcad4ddf2010b: bsd.confs.mk: Support CONFGROUPS.yes
rG0f5ed3c427ff: bsd.confs.mk: Support CONFGROUPS.yes

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 created this revision.Mon, Oct 6, 6:58 AM

Herald added subscribers: emaste, imp, bdrewery. · View Herald TranscriptMon, Oct 6, 6:58 AM

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

Harbormaster completed remote builds in B67574: Diff 163614.Mon, Oct 6, 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.Mon, Oct 6, 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.Wed, Oct 8, 5:47 AM

Harbormaster completed remote builds in B67633: Diff 163741.Wed, Oct 8, 5:47 AM

ivy added a child revision: D52974: libexec/rc/rc.d/Makefile: Use CONFGROUPS.yes.Wed, Oct 8, 5:47 AM

imp accepted this revision.Wed, Oct 8, 5:56 AM

This revision is now accepted and ready to land.Wed, Oct 8, 5:56 AM

Closed by commit rG0f5ed3c427ff: bsd.confs.mk: Support CONFGROUPS.yes (authored by ivy). · Explain WhyWed, Oct 8, 6:13 AM

This revision was automatically updated to reflect the committed changes.

ivy added a commit: rG0f5ed3c427ff: bsd.confs.mk: Support CONFGROUPS.yes.

ivy added a commit: rGcad4ddf2010b: bsd.confs.mk: Support CONFGROUPS.yes.Fri, Oct 10, 4:44 AM