PROG_OVERRIDE_VARS should override default values
ClosedPublic
Actions

Authored by ngie on Mar 29 2019, 7:01 PM.

Details

Reviewers

asomers
bdrewery
emaste
jtl
sjg

Commits

rS345723: PROG_OVERRIDE_VARS should override default values if specified

Summary

The behavior prior to this change would not override default values if set in
bsd.own.mk. For example: BINMODE defaults to 0555. If someone wanted to set
the BINMODE to NOBINMODE (0444) for prog, for example, like
BINMODE.prog= ${NOBINMODE}, bsd.progs.mk would not honor the per-prog
setting.

This change unbreaks variables defined in PROG_OVERRIDE_VARS which have
defaults set before bsd.progs.mk is included.

MFC after: 1 momth

Test Plan

capsicum-test, which relies on a program that is installed with NOBINMODE and
04555 (sticky bit set).

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

ngie created this revision.Mar 29 2019, 7:01 PM

Herald added a subscriber: imp. · View Herald TranscriptMar 29 2019, 7:01 PM

Harbormaster completed remote builds in B23387: Diff 55607.Mar 29 2019, 7:01 PM

So the problem is that while overriding BINMODE currently works when including bsd.prog.mk, it doesn't work when including bsd.progs.mk?

In D19755#423431, @asomers wrote:

So the problem is that while overriding BINMODE currently works when including bsd.prog.mk, it doesn't work when including bsd.progs.mk?

... when bsd.own.mk is pulled in beforehand -- that's correct!

ngie edited the summary of this revision. (Show Details)Mar 29 2019, 7:30 PM

Makes sense now. The new commit message is clearer.

This revision is now accepted and ready to land.Mar 29 2019, 8:40 PM

ngie mentioned this in D19758: Integrate capsicum-test into the FreeBSD test suite.Mar 29 2019, 10:40 PM

ngie mentioned this in rS345719: Merge tests/sys/capsicum-test into tests/sys/capsicum.Mar 30 2019, 12:35 AM