From nobody Thu Oct 06 18:20:33 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Mk09Y4QQrz4f9B3; Thu, 6 Oct 2022 18:20:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mk09Y3zWkz3dYl; Thu, 6 Oct 2022 18:20:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665080433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9tiT11cin8BhcbpszH2hUUOvqMqEnGcLbb3mCOxvOew=; b=NToRejlAqFEZvP+SzS1rIM+pGlpx+gQ6b31TVIC+TLAVS3/bwz7UWy9XyEEsVcrNjt97vp jv1H3hiuf6phC9LZruAnRXSmLaDlWd7wWRzTYcMlbe/4s+KWuve+LR7T08QwEcHjt4g5wB zOyNotZ6r3+oDN0ghTgnqw8d3iNvLWk6f3k1KlMVkfGIExLub2G7zBRRXeWd3p5sfxstIg WPojGtmmk2cGGrH8PII1k+Y2omsT3KrhjkKoy77pbmEm0AUQ149ZTiEGF9nqGrsmhZdgsO pNoRZ6EZryG3iAEWLT9AnGciq47Bzjz6jThspl7u6z9UGK/j0ZYNpx5kqqzwrA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Mk09Y32T5zL3R; Thu, 6 Oct 2022 18:20:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 296IKXEX076941; Thu, 6 Oct 2022 18:20:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 296IKXPW076940; Thu, 6 Oct 2022 18:20:33 GMT (envelope-from git) Date: Thu, 6 Oct 2022 18:20:33 GMT Message-Id: <202210061820.296IKXPW076940@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dries Michiels Subject: git: e6d47601a34e - main - Makefile: replace mergemaster references with etcupdate List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: driesm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e6d47601a34ee5e07edb11dac774ace2c9ae66a2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665080433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9tiT11cin8BhcbpszH2hUUOvqMqEnGcLbb3mCOxvOew=; b=Qs4oeQ5NHn0uK9ymOXk2UBTiGVjOHOSRcLM4uIgDIbomhNg1+f4mYpsK0OPUfdaCf1nEOQ pzvIQCDj9lJsk00+VD1nrP5zWzEw1zWIqmqFMOY4tC7L1H8Qm4oONMUy7XmChFD9lZ1arw o7LXIvcLGGvmTNgc+I74u0OlrU1I9OSf4pcDX8nqtikvHe/wWaaqfb04EMzIyaQZj1Y4Ti xXDJG/cxOQFX3gTzVWt4w7oIhiXMlc97TyPV1W4PgLx2Soge23Dk5aw3fh8CmZkEyUj8Lq OCJXs2mS71Wg0io23hR4cMpyelzPdf3HLH8Nc+XnjG8IPFQQofmfhIAWzyZzQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665080433; a=rsa-sha256; cv=none; b=ohF18sMHgo0bWp+KAehXA5usyvZqY+o3nKBMK00lIcM+bYwj1sSQhAtyu6bcCJjz1c18m1 zSRdjFWP1s8Uth+KuvbeIH1yBCfSbPrQAxkPSKGUtbi+9jNXCsm3IFMGlnBFa4vGjUhAbB TUv3E26S2kZLMEPhzZv2lJe2omrJTShrirkGV+J5LfyN+cK1FB8V7txGvRCiwlFYdv/PgA L4Rzl8+RU56QS2QWnOlPcMIMh4TGgA33CznZXXgupMut3+OHGflNCR8L9dVrR1/EXttcRk qcUquP9qjlfhjqE6lBo3Mn+Pp4ENbOn8yt/gfy2m6DZ/14t71wlUE7zhcypJtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by driesm (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=e6d47601a34ee5e07edb11dac774ace2c9ae66a2 commit e6d47601a34ee5e07edb11dac774ace2c9ae66a2 Author: Dries Michiels AuthorDate: 2022-10-04 19:34:05 +0000 Commit: Dries Michiels 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)