Which branch in git is 13.0-current?

David Wolfskill david at catwhisker.org
Sun Jan 24 01:51:26 UTC 2021


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.
> 
> 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 stable/13-c256208-gf76393a6305b: Sat Jan 23 07:09:19 PST 2021     root at freebeast.catwhisker.org:/common/S3/obj/usr/src/amd64.amd64/sys/GENERIC  amd64 1300136 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: 03: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.
> 
> 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
-- 
David H. Wolfskill                              david at 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.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 618 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/freebsd-current/attachments/20210123/8e2f5604/attachment.sig>


More information about the freebsd-current mailing list