From owner-freebsd-arch@freebsd.org Mon Jan 25 21:03:59 2021 Return-Path: Delivered-To: freebsd-arch@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 750A74F1A11 for ; Mon, 25 Jan 2021 21:03:59 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from outbound5a.ore.mailhop.org (outbound5a.ore.mailhop.org [44.233.67.66]) (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 4DPj5q06ggz3LYQ for ; Mon, 25 Jan 2021 21:03:58 +0000 (UTC) (envelope-from ian@freebsd.org) ARC-Seal: i=1; a=rsa-sha256; t=1611608631; cv=none; d=outbound.mailhop.org; s=arc-outbound20181012; b=CUsU0C7t5rmn6R2353TKMR6W4X00nthtqpUtU4Y9EsgJ9iTRqebwspAp3U/MuK9Em6W2Vl2CPOqcQ cp2exbvMOpQD8x1famynlirU+o2vM7sVycn5JqwNShRNj9jN4ktRZMaW3Nk2lJkLz90J6M2WlFE9PH 67AFpuiA2ToGFNQD0Yq7oLfokUrezA4XfWjbyZaliUCe+5nHbluJXUyfQ3cOMtoVBXOkMdpdPPAs0a FFvGyX72awlf3gcK/VViY2yirhDlyxmsOltaoXTvH5Htj304G/OyyyO2UNI+ccGvlD/YzE9m+eEoD4 wTTJQ52i4nQ7/T/s7hgSqV/g1mZMVfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=arc-outbound20181012; h=content-transfer-encoding:mime-version:content-type:references:in-reply-to: date:to:from:subject:message-id:dkim-signature:from; bh=YuAWh12qlCE4xVZWvIVAQg3KvG1sXlQ3Eo+sQE/mdhk=; b=nKSv9s+yQBsTl6jvYqkAj2tPI16/5gg255JJHAPdB/BqUEfEaKWMr0dk4RyyOJBnYb3olPZIqWePa 1GTQPEB0NoLdWtPW++m9cTrl3BLutnRsKujacZn8//1rbolJPqZdJarSYeBFGKQC0D/T1fgU8qgN8p 4VdPbz78cThu5j7wxauTzq8bxYT4+8Bo+Z5DQwaYA9xRt8CdLYmmVcYA3oHw5xEfVY38O9UwDtQ140 9FWWRacrTYh3vHNQGFQ3pFt0redUSRx9AzILPYm/ofeXBsn068i+z1kJXQEgWSBTgsL/z36lwg7cam fPs1MbphaNB+ihM0HP2PCJZ0IOlYBxg== ARC-Authentication-Results: i=1; outbound3.ore.mailhop.org; spf=softfail smtp.mailfrom=freebsd.org smtp.remote-ip=67.177.211.60; dmarc=none header.from=freebsd.org; arc=none header.oldest-pass=0; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=dkim-high; h=content-transfer-encoding:mime-version:content-type:references:in-reply-to: date:to:from:subject:message-id:from; bh=YuAWh12qlCE4xVZWvIVAQg3KvG1sXlQ3Eo+sQE/mdhk=; b=gAGxPuOlLh8zNHBspQJVsKBKx0ImV72xGM1ufBuecsZwjNPs/p6BYuE4+Sm3uqbVUtAYJRhr2O85a AcCE30mFUqFSXzCWDy0Bg1cT/+FtNdAVH1BA+DGuq3aErRCXILpWfBsEsoCDv8hahs0o/LqGzzFIA0 MW7MbtEzqQGpSUGyw2Fj53SlO1Y+/1tLIpNO/Ij52Yln9ZlnI2o3Jgg+2m8KBb4FgOdkIN7DvxjVmY 8eBn8yyxbvv8pTLDo/Ij8VPgEDcvP66An25mxvJaa63RfDEUoPklvd5/68jGDJC4r8qyXFoeaRZZr/ aL2PLOce6inGxPlFhJrHxvFpJ53qNNg== X-Originating-IP: 67.177.211.60 X-MHO-RoutePath: aGlwcGll X-MHO-User: d1e59d72-5f50-11eb-8ba0-614106969e8d X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Mail-Handler: DuoCircle Outbound SMTP Received: from ilsoft.org (c-67-177-211-60.hsd1.co.comcast.net [67.177.211.60]) by outbound3.ore.mailhop.org (Halon) with ESMTPSA id d1e59d72-5f50-11eb-8ba0-614106969e8d; Mon, 25 Jan 2021 21:03:50 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.15.2/8.15.2) with ESMTP id 10PL3mf7008909; Mon, 25 Jan 2021 14:03:48 -0700 (MST) (envelope-from ian@freebsd.org) Message-ID: <10fec1da415cd8d3c080a2173b9245ff35fceac8.camel@freebsd.org> Subject: Re: Change in the uname From: Ian Lepore To: Warner Losh , "freebsd-arch@freebsd.org" Date: Mon, 25 Jan 2021 14:03:48 -0700 In-Reply-To: References: Content-Type: text/plain; charset="ASCII" X-Mailer: Evolution 3.28.5 FreeBSD GNOME Team Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4DPj5q06ggz3LYQ X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; local_wl_from(0.00)[freebsd.org]; ASN(0.00)[asn:16509, ipnet:44.224.0.0/11, country:US] X-BeenThere: freebsd-arch@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion related to FreeBSD architecture List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jan 2021 21:03:59 -0000 On Mon, 2021-01-25 at 13:04 -0700, Warner Losh wrote: > Now that we have some experience with git, I'd like to propose we > tweak the > uname a little. > > Right now it is branch-cXXXXX-gHASH. > > First problem: cXXXX isn't linear. It suffers the same issues that > git log > does in that it includes all changes from merge commits back to a > common > ancestor. However, branch~1234 (1234 commits before the tip of > branch) > doesn't count those. > > Solution: change this to vXXXX and add --first-parent to the git rev- > list > command. This will give us something we can use with the > branch~number > notation to track down versions more easily and allow people moving > forward > 100 commits to see the v number increment by 100 commits. I'm > changing c->v > here for two reasons. (1) c is a valid hex character so cXXXXX looks > like a > hash and (2) we're changing the semantic meaning of XXXXX, so this > will > make things unambiguous. This will also make it easier to find the > revision > with the branch~123 notation should that ever become necessary (and > the v > number would decrement by 123 when people do this). > > Granted, this isn't a super-huge deal since we have the hash, but it > will > make things a bit more predictable and eliminate at least one source > of > confusion. > > Second problem: gHASH isn't cut-and-pastable. And it makes it look > like a > git describe token when it isn't. > > Solution: delete the 'g'. > > So the new uname will be branch-vXXXXX-HASH. > > I'd like to push this to stable/13 as well before the release so > we're not > stuck with two versions. > > See https://reviews.freebsd.org/D28338 for the proposed change. > > Comments? > > Warner That all sounds good, except the 'v' is a bit odd, normally it implies a "version" number, which isn't exactly what this is. How about 'n' or '#' since it's just a count? -- Ian