Date: Thu, 6 Oct 2022 18:20:33 GMT From: Dries Michiels <driesm@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: e6d47601a34e - main - Makefile: replace mergemaster references with etcupdate Message-ID: <202210061820.296IKXPW076940@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by driesm (ports committer): 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(-) diff --git a/Makefile b/Makefile index 5ed2bffb3e77..7ca6d5d9c218 100644 --- a/Makefile +++ b/Makefile @@ -84,9 +84,9 @@ # 4. `make installkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC). # [steps 3. & 4. can be combined by using the "kernel" target] # 5. `reboot' (in single user mode: boot -s from the loader prompt). -# 6. `mergemaster -p' +# 6. `etcupdate -p' # 7. `make installworld' -# 8. `mergemaster' (you may wish to use -i, along with -U or -F). +# 8. `etcupdate -B' # 9. `make delete-old' # 10. `reboot' # 11. `make delete-old-libs' (in case no 3rd party program uses them anymore)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202210061820.296IKXPW076940>