Bug 260822

Summary:	/usr/src/Makefile needs to be updated for etcupdate in comments
Product:	Base System	Reporter:	antonfb
Component:	misc	Assignee:	Dries Michiels <driesm>
Status:	Closed FIXED
Severity:	Affects Some People	CC:	driesm, grahamperrin
Priority:	---
Version:	13.0-RELEASE
Hardware:	Any
OS:	Any

Description antonfb 2021-12-30 18:18:57 UTC

The comments in /usr/src/Makefile regarding building from source still reference mergemaster and not etcupdate. Following these instructions can corrupt system configuration. These comments need to be updated for etcupdate and remove mergemaster.  Probably also pointing at the handbook would be a good idea since this is more complicated now, re: initializing etcupdate prior to updating source code.

Comment 1 Graham Perrin freebsd_committer

2021-12-31 19:04:52 UTC

See also (documentation) bug 206866, bug 256830, bug 260253

Comment 2 commit-hook freebsd_committer

2022-10-06 18:21:16 UTC

A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/src/commit/?id=e6d47601a34ee5e07edb11dac774ace2c9ae66a2

commit e6d47601a34ee5e07edb11dac774ace2c9ae66a2
Author:     Dries Michiels <driesm@FreeBSD.org>
AuthorDate: 2022-10-04 19:34:05 +0000
Commit:     Dries Michiels <driesm@FreeBSD.org>
CommitDate: 2022-10-06 18:19:16 +0000

    Makefile: replace mergemaster references with etcupdate

    Similar to UPDATING and handbook changes, treat Makefile the same.

    PR:                     260822
    Approved by:            jhb, philip
    Differential Revision:  https://reviews.freebsd.org/D36877

 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comment 3 Dries Michiels freebsd_committer

2022-10-06 18:24:30 UTC

Thanks for the report, adjusted!