Details

Reviewers

naddy
bapt

Group Reviewers

releng

Commits

rGa8be89928930: build: Support got

Summary

Add code for using got(1), matching how git(1) is currently used:

Determining the git branch,
Determining the checked-out hash,
Determining the commit count,
Determining the timestamp of the most recent commit,
Determining if the tree is "dirty",
Generating lists of files for the src and src-sys packages, and
Excluding .got directories from src.txz and ports.txz.

The release engineer hopes to use this functionality in release builds,
since got's minimalism makes it a far more manageable build tool than
git.

MFC after: 1 week
Sponsored by: Amazon

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 78230
Build 75113: arc lint + arc unit

Event Timeline

cperciva created this revision.Sun, Oct 11, 1:47 AM

Herald added subscribers: ivy, jrtc27, emaste, imp. · View Herald TranscriptSun, Oct 11, 1:47 AM

cperciva requested review of this revision.Sun, Oct 11, 1:47 AM

Harbormaster completed remote builds in B77987: Diff 189445.Sun, Oct 11, 1:47 AM

cperciva added a reviewer: bapt.Sun, Oct 11, 1:48 AM

release/Makefile and sys/conf/newvers.sh look ok, will have to find some time to review the other bits.
IMO it would be fine to commit this in a few parts - e.g. newvers.sh is useful independent of how release builds are produced

naddy added inline comments.Mon, Oct 12, 2:30 PM

Makefile.inc1
2241	The pattern match is reversed from the git one. I think you mixed up the patterns for create-source-src-package and create-source-src-sys-package.
2277	The pattern match is reversed from the git one. I think you mixed up the patterns for create-source-src-package and create-source-src-sys-package.
release/Makefile.inc1
39	Any reason not to just use "got branch"?
sys/conf/newvers.sh
302	Again, I would just use "got branch" here.

Update patch.

Use 'got cat HEAD' to get the timestamp of the latest commit. [1]

Use 'got status' instead of 'got diff' to check for a dirty tree. [1]

Use 'got info' instead of looking at .got/base-commit. [1]

Use 'got branch' instead of looking at .got/head-ref. [2]

Fix src vs. src-sys swapped regexes. [2]

Consistently 'cd ${.CURDIR}' for running got commands.

Suggested by: stsp [1], naddy [2]

Harbormaster completed remote builds in B78207: Diff 189855.Wed, Oct 14, 1:18 AM

naddy added inline comments.Wed, Oct 14, 12:22 PM

sys/conf/newvers.sh
187	That probably makes sense, but what are the desired semantics here? For instance, git diff will ignore extra files or staged changes; is that intentional or incidental?

emaste added inline comments.Wed, Oct 14, 12:48 PM

sys/conf/newvers.sh
187	This is for adding `-dirty` to the uname version string. Extra files should certainly be ignored -- extra files won't, in general, change what's built, and folks may well have miscellaneous text files, editor backups, etc. littered around the tree. Staged changes should trigger `-dirty` though -- D60722.

Ignore extra files in 'got status'

Harbormaster completed remote builds in B78230: Diff 189940.Thu, Oct 15, 12:05 AM

cperciva added inline comments.Thu, Oct 15, 12:07 AM

sys/conf/newvers.sh
187	Fixed -- now we ignore extra files; got status (unlike git status) reports staged files as modified so it was already correct for that.

emaste mentioned this in rG617c700abae7: newvers.sh: Report -dirty also with staged changes.Thu, Oct 15, 5:24 PM

naddy added inline comments.Thu, Oct 15, 11:27 PM

sys/conf/newvers.sh
186–187	got status can directly suppress selected status codes with the -S parameter. To ignore extra files and, like the git command, differences in the executable bits, we can use got status -S '?m'

Switch to got status -S '?m' | grep .

Harbormaster completed remote builds in B78250: Diff 190006.Fri, Oct 16, 12:32 AM

cperciva added inline comments.Fri, Oct 16, 12:33 AM

sys/conf/newvers.sh
186–187	Thanks! I didn't know about `-S`.

naddy added inline comments.Fri, Oct 16, 11:13 AM

release/Makefile.inc1
46–47	GITCOUNT will contain the leading spaces wc outputs. This can be a problem if GITCOUNT is used without running it through a shell expression that strips whitespace. Makefile.mirrors looks affected by this. I suggest ... wc -l \| tr -d ' ' You addressed this in newvers.sh with an extra echo $(...), which is another possibility.