From owner-freebsd-arch@freebsd.org Mon Jan 25 20:05:04 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 0C7D34F01E3 for ; Mon, 25 Jan 2021 20:05:04 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x834.google.com (mail-qt1-x834.google.com [IPv6:2607:f8b0:4864:20::834]) (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 4DPgnq1ysqz3Gnb for ; Mon, 25 Jan 2021 20:05:02 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x834.google.com with SMTP id z6so10670877qtn.0 for ; Mon, 25 Jan 2021 12:05:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to; bh=247yrtCki+Zg1FRdPGB8qQu813vVoeOIC+5tbfTVRsE=; b=OwvokZnBOSJExPMVe8BvZJZ9n93E9uK105+mS7q9HBq3TukyB9xXR1nU0laPj6pcJO md8ypEkGOPNEPJcgdZ+9xxAsmsAgppeWdriHiKiQ3J0oA86+IS5QYvb707fJiylUxcaU TenQdWUehoaw4tBt+pYZo9/zVALYV/IT+1ZruQXpgVtt2M30vmfrYqr9ge4RbFiOomax nok7ibkWT64t6odxX6PsjR+YCjR7OeT2KndaDKpua95Hj1KyPu+3xOzvgGdceXLiHH37 G7Qjd31lQ9F5vmpc2oCDKTsIgH7XRH5lKkO9+9CYtuHOjNku4MEOhjdYmiQ7BNptzYzV zgsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=247yrtCki+Zg1FRdPGB8qQu813vVoeOIC+5tbfTVRsE=; b=ta2Ajz2ZRmYHdF2JehVgZadlkXY+/do1YW+4w1to0k/WeWrMOm++ZYSlo3GzXXWtvV hs187DzJ0b7cla2hwEnQUcYVrlhhjPr9mnOu+4fM/ABBmEKGX0oBx0O7nl62in5/uAai 1+2CmwikuaujDlKOeld5UYGnBHhH71YfWbrVcpt0paqLShewDK791xLBBGCxNTRdbI0L auc1vDtnKjD5HggaWoCakTps7BwsBbsmxYz9GTlcdX3jF7ktu1I98B/YdCmsSZ+A/iQI 1TqWZdJoktjzV8YwUWkKX5/s/57/bzQ5Kkh2jKo6oJ+EqF9Mc9a7Ox7K8YkAZ4iWUm5m 4YtQ== X-Gm-Message-State: AOAM531hykB1Ro5nseQ+gvzFWQ3f+7hsSaRPBG1vSLAmxspw7jLksE7Q gXcVXkCq08/7pnbLgp9SIApv/cN8XdC9Pkfh1SX9LwdzAdsnYo0c X-Google-Smtp-Source: ABdhPJyNJ7DEtNcEweWtth+s7nUkEx9TEw2L894o7hLxlPdEOwFkn6uFn8c6/kXQcee1MfJqzelLF/tB7mEGtIUO6fM= X-Received: by 2002:a05:622a:90:: with SMTP id o16mr2055237qtw.49.1611605101295; Mon, 25 Jan 2021 12:05:01 -0800 (PST) MIME-Version: 1.0 From: Warner Losh Date: Mon, 25 Jan 2021 13:04:50 -0700 Message-ID: Subject: Change in the uname To: "freebsd-arch@freebsd.org" X-Rspamd-Queue-Id: 4DPgnq1ysqz3Gnb X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=OwvokZnB; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::834) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.00 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-arch@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::834:from:127.0.2.255]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::834:from]; TO_DN_EQ_ADDR_ALL(0.00)[]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::834:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; MAILMAN_DEST(0.00)[freebsd-arch]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 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 20:05:04 -0000 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