From owner-freebsd-current@freebsd.org Mon Jan 4 16:06:43 2021 Return-Path: Delivered-To: freebsd-current@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 31EF54DA6B0 for ; Mon, 4 Jan 2021 16:06:43 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic307-55.consmr.mail.gq1.yahoo.com (sonic307-55.consmr.mail.gq1.yahoo.com [98.137.64.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D8gVV1xwCz3C5N for ; Mon, 4 Jan 2021 16:06:42 +0000 (UTC) (envelope-from marklmi@yahoo.com) X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1609776400; bh=Mfo5xJFkvwXrgk3z4VuHmhexDvWuBYBtE89Js6/iGOl=; h=From:Subject:Date:To:From:Subject; b=cLv51AfGYf+BUpLGqSbtkQXFjX7w9nxLgXthLdKLUvMg+syE+NZO/wancuOPrWbO0jceJwZwkMtDUgn6j+yLVJeiJ1RsovjsOoE8ca30soRhMZAvkwPXb8ggZlNbVvxP9KOaRlC8BNUXSq1M6qKCoRSK4kz2iwPPMH0uOFB+NruqZa+oy284D28xr4QjVgj59UPx3LZyD/BxMgju7q9kMX2udqxJXXEGG1sCqWJh3MJ2yuljWVJiuJObUuuNQ7Aek94pafBMy1SC2dqf7VpBPq/kFuJUTa1y3wxhRCThRiPWWw/J5r9VL3VgOUkl6AQlASDVenTfW4HJXt4zdxBAFw== X-YMail-OSG: odq11K8VM1kz78LIfa.Tg5X7YBdK1rwx7yosziKtWMDMWLCqcM7zsSOx6NmMKWE EgbtlsSs0tMPuDxNhiad8rx_x6mCX713VxiTxUW3fzar941qF4Is9Ae5TyT6aKZGZIVJCjy8j4Xy 1IFFlsWCHCe8gTKuRELtPVdY4NIZplXlhe6uEdvx9qlEh_zHLTZ2NuCm6wxNhxYGlRvOPzec49FA tweag1w8XiIXtw51b_NHiJVgxXWKVpyxkF3c3EQr.239LlRC0vY3DRVPObpFxTMUnN973FQS2rp1 CmhTVnRR6NPwmk0P9_jaTcFAUypDhHV7S_98gDKpXZuJnuyDtmeeKljE43M7SJqYqwvHw.jyQVSs sdYZ4w65ssmZPQ_p0Vx_lFJYwmZMuWVaMHHEvTUjUVfeC664mtoZlRp4FrKOi4.qNZhGLtLoKRSp r4mcP5aaBSjetB7pUnY2FK8SF.4XMufoZac.gL5oAG5ECfUZXPegYdnlNIo0z_8bxBi_bku2ovFY x1xQVf7rcX6uz5Wmxbr0RNW5wEQZsJqeAti.RujRle3Ap0Uvi8sQ.LOiiFaVjO3gMgjt.XOtIYgy imgwItzIcdOOWkJpco27YNXZktY5NbXO.mP7fuw.Bxr7RAF0.zeSZmDFUGAcmiagOVtA6Wa9gsaj QpyD97z3C8gGZt6XI5BtfcRh8ILipaVPjNsynhMhyPB.UrM1oktz0h0aOo_bBfVk3371G429R99J RvUn6NW.QzlcvTtx9UGPoOZBXSSI03jAnBZhsoO0g1i8JtP421a.e9NA2ZbYCYi6.hTeVblTRcEc T_gNG2vxjev53woADQKgH6wtlii1Ylla4z6PkQjmfbjlOtIyfPgBx1wz.TkqLtaNjNgul8nnxB6n 4u2ZsEZQG8VlHO6jsrbsbl0vNfBtuwiZQyPzS543ci35jXg.NCI_p8QLRk6NVZsYe4oHiiiWGUZM 4gxCoT2CvxU5JrbPPBNTuwpOcCmz8otYOUet_epdi2TcwMqMxnug5CSr0ZlbyF0WSVhKfrKM.kmj K.DbhnZKyLL0JU0KwK_rKKsV80EaHF6hYi8kNuajXhUMVZovo8WXBrKKrepT7vSjnUBloQVO4sjw eteB6FWHUFv6wYPQqa37ImuY8PFoglZR32fZpJ7liYFJFo8Twdrw3n9QRoS_GGTwhyCKgONZOjVN CW90P16wTIBsVOK5AZc2cmw4JR9yB7Frao1r.zHtHVBZ07tpVs7RTsJLfwfQvSRYzsAPgJnJhI7e Z1yX_F_PJlEox8RIkznoT4pe9PBC68LRGBEegUnabUmlPKf9.pta5SWM3sON.Lz3DY9RiDCwp4tA NCZDKV_dROeldP9_FU7VenMnDv1FSkssgGQe_17uHDyiizEEyGClK5KGUe5uFlGM_aZa151Z0mKG jyTiWAbHvyZQUPLerr5ZOT07YFpVceji3Pj.fV3q2icL._WO33UcF2fqeXVXgIXqQlrwlyi1OVxv Q3fD15xShumbjM_RjOoMCgmKjZfH_6RRjB9MiQ1HoWFZYyhOo17001JL1KTNF5j8OZ2LVGuEnAUu Y03D5zO3Ck80WRaVKYnOi_Bp9sX517.BRYLyMqHmWo_M7k38CUJ6uUDmXLNiqs2ubNtfq3TgF8rG RvDh8DO6uzW4OnHmeUbZrTOj76KrE352zo09CVGnk2bBIJTSTc7I_AcxOur1X8B_Oa.gCwaGjzdR BMc.G91ysIFxVN6UEil_S4lgpWjx1JsILqZKZ66IolWFRv_AUa3jOPv6z71DwodrZQiK52PzOosg srmIJYa56eNmirdTA6E86Lv3gAhkAU9L0j.MbpysAnYcTQIp4to69S3ZH8PgS7xxedh5zgi8qkG5 5evF.WFAovvJQ8Wcal_n9JRDL4hVw_jlRA8k3DVLXFtFU2oKiH9W_LHirGl7YE0cFWylRUyKuf.E Yt1.Qz6gVsHKdfCn_dEnk.cIkizThwXcTWaXRAZH7OpkSByHTt_6y5mPhA0QTJDUu9iZ6bILD19i .F0w4.JavYQmaOLgSVm3Rr5_NEz4lH4hyFVhpwT_Yd304uQUdg4vXy7U4rLKDtqgbwYSdeLcr32z a2EfAcypr3kv7S.gw7OZBQhsZFw88yDUCj.YQVXg1iPMFl3BLDn2Bnf9uT3CKjyY90kUV_Tk9n_g djjbE7_V05.eSOWGy6GQLa8rmSUBjVT9tlKVPTmU.SlBa.uYso52Ddkg0y74tYHrDq8bb1QdrvjT b30HhVUiiiV54l.2p4XktxuiTtUzTaqV9zQxja0_qjKyriV6Rm2Oh9sJuyYzs1LVuvW4fsq.iPcW 2gFa9sPI8GAnZEjBq6NmWBH_L9qdICUApKzw3HRJ3o5uQKzUF3ZxYJ4ZPsGMPRtW71PZPvgfWEBR a6fNnCxLqug2pjGuVLBhcOku06KKh0Br2UVDZnLGLyeIAHL.bi3.lSYy6I_fttkFZbiiN2pEtg89 nJHYhEzaUFYJIW15rGTy2Hab6l83EklmhN4018Pxq4SxJJxf87jI4deBaFT1IAIdIhHhNXZyJHeW Ub6PhY4u0LG4- Received: from sonic.gate.mail.ne1.yahoo.com by sonic307.consmr.mail.gq1.yahoo.com with HTTP; Mon, 4 Jan 2021 16:06:40 +0000 Received: by smtp423.mail.ne1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 0fd132c1017d1971d0d17df776b36ffd; Mon, 04 Jan 2021 16:06:35 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.40.0.2.32\)) Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? Message-Id: Date: Mon, 4 Jan 2021 08:06:33 -0800 Cc: david@catwhisker.org, ohartmann@walstatt.org To: FreeBSD Current X-Mailer: Apple Mail (2.3654.40.0.2.32) References: X-Rspamd-Queue-Id: 4D8gVV1xwCz3C5N X-Spamd-Bar: / X-Spamd-Result: default: False [-0.50 / 15.00]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[yahoo.com]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; DKIM_TRACE(0.00)[yahoo.com:+]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; RBL_DBL_DONT_QUERY_IPS(0.00)[98.137.64.31:from]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; SUBJECT_ENDS_QUESTION(1.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; NEURAL_SPAM_SHORT(1.00)[1.000]; SPAMHAUS_ZRD(0.00)[98.137.64.31:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.64.31:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.64.31:from]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-current] X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jan 2021 16:06:43 -0000 David Wolfskill david at catwhisker.org wrote on Mon Jan 4 12:29:45 UTC 2021 : > After trying to use mergemaster for a couple of weeks (after the = switch > to sources from git, vs. svn) of daily tracking of head & stable/12 on = a > pair of machines (and weekly tracking of stable/12 on another 4), I = gave > up and switched to etcupdate. >=20 > Note that each of mergemaster and etcupdate has a "-p" flag; it is > functionally equivalent between the two, but called slightly > differently: >=20 > * mergemaster: 'Pre-buildworld mode' >=20 > * etcupdate: '=E2=80=9Cpre-world=E2=80=9D mode' >=20 > And note that per src/UPDATING, "mergemaster -Fp" is invoked after = "make > buildworld" but before "make installworld" (under "To rebuild = everything > and install it on the current system.", under "COMMON ITEMS:"). I'm still experimenting but man etcupdate reports: QUOTE Bootstrapping The etcupdate utility may need to be bootstrapped before it can be = used. The diff command will fail with an error about a missing reference = tree if bootstrapping is needed. Bootstrapping etcupdate requires a source tree that matches the = currently installed world. The easiest way to ensure this is to bootstrap etcupdate before updating the source tree to start the next world = upgrade cycle. First, generate a reference tree: etcupdate extract Second, use the diff command to compare the reference tree to your current files in /etc. Undesired differences should be removed = using an editor, patch(1), or by copying files from the reference tree = (located at /var/db/etcupdate/current by default) If the tree at /usr/src is already newer than the currently = installed world, a new tree matching the currently installed world can be = checked out to a temporary location. The reference tree for etcupdate can = then be generated via: etcupdate extract -s /path/to/tree The diff command can be used as above to remove undesired = differences. Afterwards, the changes in the tree at /usr/src can be merged via a regular merge. END QUOTE I do not remember mergemaster having a bootstrap stage in setting it up, a stage that should be executed before /usr/src (or whatever) is updated. So the procedures are different overall. =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar)