Page MenuHomeFreeBSD
Differential D2860

restore include of make.conf to orginal location
ClosedPublic
Actions

Authored by sjg on Jun 18 2015, 6:20 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Aug 23, 12:37 PM
Unknown Object (File)
Sat, Aug 22, 3:58 PM
Unknown Object (File)
Sat, Aug 22, 1:11 PM
Unknown Object (File)
Fri, Aug 21, 1:22 PM
Unknown Object (File)
Thu, Aug 20, 9:09 PM
Unknown Object (File)
Thu, Aug 20, 9:09 PM
Unknown Object (File)
Thu, Aug 20, 9:08 PM
Unknown Object (File)
Thu, Aug 20, 9:08 PM
View All Files
Subscribers
avg
bdrewery
dim
emaste

Details

Reviewers
imp
Commits
rS284598: Move include of make.conf back to its old position.
Summary

Including make.conf early breaks users who have
non-trivial things there.

Move its include back to where it was, and include
local.sys.env.mk early - which we specifically define to
only do things safe at that early point.

Might as well add a corresponding src-env.conf to
include via src.sys.env.mk

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

sjg updated this revision to Diff 6294.Jun 18 2015, 6:20 PM
sjg retitled this revision from to restore include of make.conf to orginal location.
sjg updated this object.
sjg edited the test plan for this revision. (Show Details)
sjg added a reviewer: imp.
Herald added subscribers: emaste, bdrewery. · View Herald TranscriptJun 18 2015, 6:20 PM
dim added a subscriber: dim.Jun 18 2015, 8:03 PM
sjg updated this revision to Diff 6295.Jun 18 2015, 8:09 PM
sjg updated this object.

simplify include of SRC_ENV_CONF

avg added a subscriber: avg.EditedJun 18 2015, 8:48 PM

Looks like this differential was generated from a tree that differed from a vanilla head.
When I ran arc patch D2860 it couldn't find share/mk/src.sys.env.mk.

sjg added a comment.Jun 18 2015, 8:56 PM

Avg: I did

svn cp local.sys.mk local.sys.env.mk
svn cp src.sys.mk src.sys.env.mk

so no you won't find them in svn yet

imp edited edge metadata.Jun 19 2015, 6:08 AM

First blush, this looks good to me. I'll sleep on it to see if anything bubbles up while the rest of my brain is off...

avg added a comment.Jun 19 2015, 6:36 AM
In D2860#55283, @sjg wrote:

svn cp local.sys.mk local.sys.env.mk
svn cp src.sys.mk src.sys.env.mk

arc patch D2860 still failed to apply cleanly, so I can't test.

Closed by commit rS284598: Move include of make.conf back to its old position. (authored by sjg). · Explain WhyJun 19 2015, 2:56 PM
This revision was automatically updated to reflect the committed changes.
sjg mentioned this in rS284598: Move include of make.conf back to its old position..

Revision Contents
Changeset List

PathSize
head/
share/
mk/
43 lines
38 lines
24 lines
15 lines
20 lines

Diff 6333

View Options

head/share/mk/local.sys.env.mk

Loading...
View Options

head/share/mk/local.sys.mk

Loading...
View Options

head/share/mk/src.sys.env.mk

Loading...
View Options

head/share/mk/src.sys.mk

Loading...
View Options

head/share/mk/sys.mk

Loading...