From owner-freebsd-current@freebsd.org Sun Jan 24 01:53:11 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 07B3A4E6728 for ; Sun, 24 Jan 2021 01:53:11 +0000 (UTC) (envelope-from donaldwillinger@gmail.com) Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DNbcP6YJcz3lP9 for ; Sun, 24 Jan 2021 01:53:09 +0000 (UTC) (envelope-from donaldwillinger@gmail.com) Received: by mail-lf1-x134.google.com with SMTP id i187so2645312lfd.4 for ; Sat, 23 Jan 2021 17:53:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=fQoxHWM5PhmOQOegtiINP2+0bjaGR5tK2l1UcPZP+no=; b=t/Yp1BF3YgPVBDJpcO/jaj5b3IGHOlbtkIaewDoBCaRpGp4WSgsPoG+5ILalOTu+v4 Q8MepEp+8XMUrUNYWLp1rUQhBs4jdUidjafxt2xup2n7M/bm9i0vufkC3eyZifB5PlBr 7K82MamUFP3g7JRebGERqZQdfvT3bMRBPktsOhzTB5boWKDoE/zo0lkUiEdrpnv/tX4w uvvz1vmal15KGvy/CYbObQBBF0NGr3lTTuOA85ipZBH1TxslmDQs3u58r6U+hRP/80U4 PfUuBNgB61ZakVwRor9DYv/3rK8d48ilIi+JuJAn0f1Dei5d/h0zwFMtJW9vjbup4yw7 WmLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=fQoxHWM5PhmOQOegtiINP2+0bjaGR5tK2l1UcPZP+no=; b=PiFfftz2oCdfePk9QXNjzHHuENKVqsSIc247KHBchCwmxgWNULj3SxREKgWQgpnbLf QIoJSZ8SiJt/wwhUOIaLmMKgB1uUau2uQj2AEx1i01l0Vbc6cqkOn8hmpkq0TinKtwes u4JKUyESErE+ubUuxmHfCMqHotN5Fu8UL5g1MHzkDB6mZqBoDl77jCRzdirjg6mBmEBs 6C20KYCgJanmJrlflMSf2GlMeXUOl2tRNGcb20e7WQbScfndgnsEqOtgOUrqW8FXdl6D FPcJCf5l/ZiJVDVeVg2WI/xmvhJMrejSUiCt615uZFXhtfblHL3jN763avzUGcY19lfN B7og== X-Gm-Message-State: AOAM530BosD/1ntxofcwnBcvThLt4YU061t6LDI07PQsfQps5ZFcmbqP bbIArQGBIFBkBc0V3k2QSwQtm2mTYNGCiSwafXhXv/Q3IlY= X-Google-Smtp-Source: ABdhPJxzabJ+ilKOc+0Pvgr8B+7qRtpehkR0PqgT6QTCxHEzJvpLBmToywAys3mHQcpkejjM/kgb3skSKmabeaqUkgo= X-Received: by 2002:ac2:5f05:: with SMTP id 5mr526609lfq.127.1611453188268; Sat, 23 Jan 2021 17:53:08 -0800 (PST) MIME-Version: 1.0 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> In-Reply-To: From: Donald Willinger Date: Sat, 23 Jan 2021 19:52:57 -0600 Message-ID: Subject: Re: Which branch in git is 13.0-current? To: David Wolfskill , "Russell L. Carter" , freebsd-current@freebsd.org X-Rspamd-Queue-Id: 4DNbcP6YJcz3lP9 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=t/Yp1BF3; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of donaldwillinger@gmail.com designates 2a00:1450:4864:20::134 as permitted sender) smtp.mailfrom=donaldwillinger@gmail.com X-Spamd-Result: default: False [-2.82 / 15.00]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; NEURAL_HAM_SHORT(-0.82)[-0.823]; FROM_EQ_ENVFROM(0.00)[]; SUBJECT_ENDS_QUESTION(1.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2a00:1450:4864:20::134:from]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-current@freebsd.org]; SPAMHAUS_ZRD(0.00)[2a00:1450:4864:20::134:from:127.0.2.255]; MIME_TRACE(0.00)[0:+,1:+,2:~]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::134:from]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-current] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 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:53:11 -0000 Look for 14-current. There is no more 13. as I understand it. On Sat, Jan 23, 2021 at 7:51 PM David Wolfskill wrote: > 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@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@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. >