Makefile.inc1: Let the buildetc target run outside of etc
ClosedPublic
Actions

Authored by markj on Apr 22 2025, 2:30 PM.

Details

Reviewers

jhb
jrtc27
imp
brooks
emaste
kevans
dim

Commits

rGf83ec40fca52: Makefile.inc1: Let the buildetc target run outside of etc

Summary

Commit 49bc071f4088 ("nsswitch.conf: Avoid modification after
installation") changes handling of nsswitch.conf such that we make a
copy in the objdir during a build. Historically, the in-tree
nsswitch.conf lived under etc.

The buildetc target and its copy set SUBDIR_OVERRIDE=etc when building
the object tree, but I think this isn't right when conf files are
scattered around the src tree. If any of them require non-trivial
processing, they'll get skipped during buildetc, and then some
build-time commands may run during installetc. In the linked PR, this
fails because the src tree is mounted read-only and no objdir was
created during buildetc.

Remove the SUBDIR_OVERRIDE for the _obj target, and build the
buildconfig target across the tree.

PR: 286072

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 63646
Build 60530: arc lint + arc unit

Event Timeline

markj requested review of this revision.Apr 22 2025, 2:30 PM

markj created this revision.

Harbormaster completed remote builds in B63631: Diff 154092.Apr 22 2025, 2:30 PM

brooks accepted this revision.Apr 22 2025, 4:14 PM

This revision is now accepted and ready to land.Apr 22 2025, 4:14 PM

jrtc27 added inline comments.Apr 22 2025, 4:21 PM

Makefile.inc1
1688	Does this do anything that buildconfig won't? I don't love that this (presumably) builds things twice in etc?

markj added inline comments.Apr 22 2025, 4:52 PM

Makefile.inc1
1688	There is at least one difference, in etc/sendmail/Makefile: the `all` target builds some configuration files by running .cf files through m4. I don't love the duplication either. Perhaps I should update the sendfile rules to be built by "buildconfig".

jrtc27 added inline comments.Apr 22 2025, 5:19 PM

Makefile.inc1
1688	If it's not a pervasive issue then yeah having everything be under buildconfig would be great
usr.sbin/etcupdate/etcupdate.sh
225 ↗	(On Diff #154092)	So this code here is a fallback for using new etcupdate with older source trees, and should correspond to what their old etcupdate was doing. Given 49bc071f4088 only applies to new source trees, it should be using buildetc for them. All this change does is risk breaking running etcupdate on older trees if for some reason dropping the SUBDIR_OVERRIDE or adding buildconfig doesn't work there.