From owner-freebsd-stable@freebsd.org Wed Feb 10 16:50:07 2021 Return-Path: Delivered-To: freebsd-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3C1A254C036 for ; Wed, 10 Feb 2021 16:50:07 +0000 (UTC) (envelope-from tech-lists@zyxst.net) Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4DbQjV3zmvz4k4h for ; Wed, 10 Feb 2021 16:50:05 +0000 (UTC) (envelope-from tech-lists@zyxst.net) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 83777B64 for ; Wed, 10 Feb 2021 11:50:03 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Wed, 10 Feb 2021 11:50:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zyxst.net; h= date:from:to:subject:message-id:mime-version:content-type; s= fm1; bh=QS077nwJ3/4CYQPAV36ZZGv7VLllItif5i8MASRBZFg=; b=ZySky1/r pvW+S54WHRhLVRsmu0i12FE0/Jn09vam0KENLt8VUIj9vGraS+sClOx0bxBg8VOE 0T+2EszBeKicLriFAGAIFX/diqDUsCiQnftqCksN2Qul8nMtfn0bbVW4wmXccWc9 iG0n/FeZKC79Zm2mmcv1h9drr8Zx+iT3qVw0yG7/WHHToUpfayzSx5pe1kftBXij sFb6drkHipzpImhDi1IJvUTzibLuhTqJpQ3tHWMPNaDGuobST3icWP+Y7+Xt9z2A SA5v/LcSFm4PQRCQDWMAIvYCtE4HLBxdbGfbd1bBtb3zsb6kSsQGOr75v+dLUWo4 T5mKIuhb5Susow== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; bh=QS077nwJ3/4CYQPAV36ZZGv7VLllI tif5i8MASRBZFg=; b=RwISEucAtJO248JEfgxAmaooGALEk6reAJXXfJZTFEn0c 3jR3n7feDoPYrg0wWjlWLNrFjq1SdeVVdR3XdU9dWx+bSlxG9J6mdjyjZUQyJiYv BPWxd4XHAuLbYiaZJmwYOavjo/Ans5tYK4dTgqaxiedbvmje2YWlPFbUMUdmjOMh 8YsM9nEOH12Rw1/C8gF47CWUCGGPHEDENh3ytUXgudSYmKhs0WCZliRy7whjAHhN upFGXCqY8FNOkp7+XuDIybO9BAZaye8p0SiiBDbu7Fu8cvevzYsfFLUDfxq31Gc/ lccSa9Znowap+X4XkfMutfi42qk729aZM9LlFOj8g== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrheejgdeludcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepfffhvffukfggtggusehgtderredttd dvnecuhfhrohhmpehtvggthhdqlhhishhtshcuoehtvggthhdqlhhishhtshesiiihgihs thdrnhgvtheqnecuggftrfgrthhtvghrnhepvefghffftdefkeelleehtdejledvhfdvge eijeevfffguddvhfetgeejueejueeinecukfhppeekvddrjedtrdeluddruddtudenucev lhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehtvggthhdqlh hishhtshesiiihgihsthdrnhgvth X-ME-Proxy: Received: from ceres.local (fws.zyxst.net [82.70.91.101]) by mail.messagingengine.com (Postfix) with ESMTPA id 9B7F1240057 for ; Wed, 10 Feb 2021 11:50:02 -0500 (EST) Date: Wed, 10 Feb 2021 16:50:00 +0000 From: tech-lists To: freebsd-stable@freebsd.org Subject: mergemaster and etcupdate Message-ID: Mail-Followup-To: freebsd-stable@freebsd.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="mD/aE3Oyq/Z5K9nD" Content-Disposition: inline X-Rspamd-Queue-Id: 4DbQjV3zmvz4k4h X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=zyxst.net header.s=fm1 header.b=ZySky1/r; dkim=pass header.d=messagingengine.com header.s=fm2 header.b=RwISEucA; dmarc=none; spf=pass (mx1.freebsd.org: domain of tech-lists@zyxst.net designates 64.147.123.24 as permitted sender) smtp.mailfrom=tech-lists@zyxst.net X-Spamd-Result: default: False [-5.70 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; RWL_MAILSPIKE_VERYGOOD(0.00)[64.147.123.24:from]; R_DKIM_ALLOW(-0.20)[zyxst.net:s=fm1,messagingengine.com:s=fm2]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:64.147.123.24]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-stable@freebsd.org]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCVD_COUNT_THREE(0.00)[4]; DMARC_NA(0.00)[zyxst.net]; DKIM_TRACE(0.00)[zyxst.net:+,messagingengine.com:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:64.147.123.0/24, country:US]; MAILMAN_DEST(0.00)[freebsd-stable]; RCVD_IN_DNSWL_LOW(-0.10)[64.147.123.24:from] X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Feb 2021 16:50:07 -0000 --mD/aE3Oyq/Z5K9nD Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, I've used mergemaster for years like this: 1. mergemaster -p after the make installkernel step 2. mergemaster -Ui after the make installworld step Although I've seen nothing announced making etcupdate mandatory,=20 I guess etcupdate will be the new way of doing things.=20 My questions are: [a] what are the etcupdate equivalents of the above mergemaster commands? [b] do I need to do any prep before running make buildworld, or with any other step in the buildworld/installworld process? [c] when will mergemaster stop working? context: amd64 stable/13 thanks, --=20 J. --mD/aE3Oyq/Z5K9nD Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE8n3tWhxW11Ccvv9/s8o7QhFzNAUFAmAkDq8ACgkQs8o7QhFz NAU+Tg//Q7Z4nM7HUaJ6BkNP0nCI3sTLq1Z1NWk01qfN4VsCyNpmhtJh1L/zin/d oeywg6HQsmksy7DhyFty3kWP+AUvdiJnqTLlPjBgp0rOhuKpNZqwmyeUuAQIWC1V LlyUB/9v5ofAj7n4GKslvqGIskdUxz0V/OfwdHmzoHcAd2VydTgGdiYijw2PSaGL kvzLZpYfsOoeyUpGi13omtBIP7+ELUDP5hgmhPnF6Immaix/7yns7/oI9OW6rEAI Z9stYQqCbk5s2du4jiPh+HrHvP8tHxqELUAgmGB7d8d3rfMHHq4+xkkR7oFkb37T lK3VhIVFN9rEbhUorFdR9pvmOEd25F25+bOoQwM0jWbJ1lNEHhw5+uRfFMakdSBs y+BnbEgbx1YQXjtjthwSIMaBZ/HM1VfWeWiv9jxfOf20aqgaVeeO1nvvJALmf545 kPI4EKIbmQYT9oE8anFMM7AFmGnLiuqEor7I9lmFg2EEyJJWvaS8TmQZeZS3AYKq 8zbjHSlI9Pai9LQDXexNzv7PnmKq8etxbCqyvE63jZ2CpQubJ0YkvOeL14GkQc0D 8VbnijON5/cpaP3ndx/8scTGPB5xgllfSluHH2qrwybGbQssglj9lhZmxZJROEYP 7s1IVdHuPQugeQX0yWZnsWdsBL3FUDRBtYDAReN3TAu2xMohdAM= =QhWL -----END PGP SIGNATURE----- --mD/aE3Oyq/Z5K9nD--