From owner-freebsd-current@freebsd.org Sun Jan 24 01:51:26 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 A61354E5F72 for ; Sun, 24 Jan 2021 01:51:26 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mx.catwhisker.org (mx.catwhisker.org [107.204.234.170]) (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 4DNbZP4dq2z3lYW for ; Sun, 24 Jan 2021 01:51:25 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from albert.catwhisker.org (localhost [127.0.0.1]) by albert.catwhisker.org (8.16.1/8.15.2) with ESMTP id 10O1pIaO079370; Sun, 24 Jan 2021 01:51:18 GMT (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.16.1/8.16.1/Submit) id 10O1pIoK079369; Sat, 23 Jan 2021 17:51:18 -0800 (PST) (envelope-from david) Date: Sat, 23 Jan 2021 17:51:18 -0800 From: David Wolfskill To: "Russell L. Carter" Cc: freebsd-current@freebsd.org Subject: Re: Which branch in git is 13.0-current? Message-ID: Mail-Followup-To: David Wolfskill , "Russell L. Carter" , freebsd-current@freebsd.org References: <86h7n7a9jx.fsf@gmail.com> <000001d6f1a8$dcd03280$96709780$@gmail.com> <86ft2ra80q.fsf@gmail.com> <004101d6f1ac$62a619d0$27f24d70$@gmail.com> <2a44aadc-7588-5bee-ac95-38b6b26f5ba4@pinyon.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="GZS1iXHAig7n6P75" Content-Disposition: inline In-Reply-To: <2a44aadc-7588-5bee-ac95-38b6b26f5ba4@pinyon.org> X-Rspamd-Queue-Id: 4DNbZP4dq2z3lYW X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of david@catwhisker.org designates 107.204.234.170 as permitted sender) smtp.mailfrom=david@catwhisker.org X-Spamd-Result: default: False [-2.54 / 15.00]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; FREEFALL_USER(0.00)[david]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:107.204.234.170]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; DMARC_NA(0.00)[catwhisker.org]; RBL_DBL_DONT_QUERY_IPS(0.00)[107.204.234.170:from]; NEURAL_SPAM_SHORT(0.86)[0.856]; SPAMHAUS_ZRD(0.00)[107.204.234.170:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:7018, ipnet:107.192.0.0/12, country:US]; SUBJECT_ENDS_QUESTION(1.00)[]; MAILMAN_DEST(0.00)[freebsd-current]; RCVD_COUNT_TWO(0.00)[2] 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: Sun, 24 Jan 2021 01:51:26 -0000 --GZS1iXHAig7n6P75 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Jan 23, 2021 at 06:34:58PM -0700, Russell L. Carter wrote: > ... > > That is correct, 13-stable has been branched from 13-current which has = now > > been bumped to 14-current. > > Because it's a major version change going from 13 to 14, pkg is a bit > > agitated regarding the ABI. >=20 > So has anyone tracking stable/12 and ports successfully completed the > git checkout stable/13; make buildworld; make installworld; mergemaster > drill? I see I can checkout stable/13. With the substitution of "etcupdate" for "mergemaster," yes. Mind, I am using ports built under stable/12: I have installed the misc/compat12x port. (My build machine is presently running poudriere under: FreeBSD freebeast.catwhisker.org 13.0-ALPHA2 FreeBSD 13.0-ALPHA2 #1162 stab= le/13-c256208-gf76393a6305b: Sat Jan 23 07:09:19 PST 2021 root@freebeas= t.catwhisker.org:/common/S3/obj/usr/src/amd64.amd64/sys/GENERIC amd64 1300= 136 1300136 building packages for stable/13. I don't plan to use them right away; this is mostly a bit of a stress-test for stable/13: bapt@ called it "poudriere" for at least one good reason.) Current status: [13amd64-ports-home] [2021-01-23_22h27m11s] [parallel_build:] Queued: 1038 = Built: 568 Failed: 0 Skipped: 0 Ignored: 0 Tobuild: 470 Time: 0= 3:21:46 > Do make.conf | src.conf | GENERIC have silent breaking changes? > I usually, recklessly, assume no. My build machine (builds and) runs a GENERIC kernel. It also builds a couple of other kernels for stable/12 and stable/13; no issues with either. > Ima throw the build->install as soon as the drill looks good. >=20 > Russell > .... I admit to having cheated a fair bit: I have also been tracking head. So last night, I "cloned" my "head" slice for use for stable/13; there was little to change, once that was done. (Yes, I use MBR/BIOS booting.) Boring details: * History: https://www.catwhisker.org/~david/FreeBSD/history/ * How I do stuff: https://www.catwhisker.org/~david/FreeBSD/upgrade.html * How I keep sources in sync: https://www.catwhisker.org/~david/FreeBSD/repo-sync.html Peace, david --=20 David H. Wolfskill david@catwhisker.org So Lindsey Graham thinks that Trump's incitement of the Capitol mob on 6 Jan should be without consequences? Graham suppoprts what the mob did??!? See https://www.catwhisker.org/~david/publickey.gpg for my public key. --GZS1iXHAig7n6P75 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE4owz2QxMJyaxAefyQLJg+bY2PckFAmAM0pVfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUy OEMzM0Q5MEM0QzI3MjZCMTAxRTdGMjQwQjI2MEY5QjYzNjNEQzkACgkQQLJg+bY2 PckVmgf/TU2KxyXonNPL1H4V2igS9yD+tkfX5p4AB7nBFZeADpTo746VB6Z3xP+V oKwYIEPYtg+8q3muQ7g1MIaxIJy6PK3fxq+O+dBFJoGk/utR4/o149nw6p1OARa3 1Yae+3PdyIXHXVSi1mgDoMNcfRyUCHqnhKkATPjNqJCj3bEKi7LMJi3QSEuteExi OMTzkNbqeZYDZ6G1Ufa6S12I7aZd4ma/biAJGI/ikyCRHJHKFmjPrQ4CJRu38feh I8AtzFMOhJGbruqvNxMC0JYqvF4/NLCdeqmP7vAB5YhJjpcJvkP3Kaz0G2bdxAY1 yG94iMT7tqlaeKbmCsZ2+RIS7tUeSQ== =holI -----END PGP SIGNATURE----- --GZS1iXHAig7n6P75--