From nobody Thu Oct 17 19:49:26 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XTz1f6vdvz5ZQ1c; Thu, 17 Oct 2024 19:49:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XTz1f61Zxz4gjK; Thu, 17 Oct 2024 19:49:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729194566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m6as6WZ3x+Q6VT55EALkMvntZtEC2x+norRUoRNP0Hc=; b=SnufC+/BIZae5IjRVkjme8mc0vG5sb3XspFgN/N8hDLo5/UeUOU9ZSJXQwUdAyXN/KqcFP CQUKe8OJjM07M4AsJD7qjEmiMBI+gTnPoutOy0sSWBCJIpcKWlMMyEUSmcMC9XPHRujyig hRT9uk5hXLzzZxqQ/zjQIlwpcyq/WQUcEO6iF/ESCB+PocVBo0TSgb7PvvbXX3pYmW4MI2 sh2zrKlGTAbTB0ojcOFZYqWNT3alrQPh6XlwRoDYORePbrXsbSlgzwhKZjKUi3omBN7JNW ZjnbUOZz7Nef9X2rMlmfQfJZBeLkRTLDfR29VTnIXRgrIKQ/6IihFOfe+dwfng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729194566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m6as6WZ3x+Q6VT55EALkMvntZtEC2x+norRUoRNP0Hc=; b=iuUe3f0QUMMWom1iAR8Cwvt5CYA91xOkx07+2N7vM+pmOeabF7q5IV6APFGQSepMKzg/h2 UXZTCn932agUVOoUHtWoXzJp5OXYfnLxA5GzaSnBlEZUGbIx/MhMGYRdzEwt8MlQURcEGX c9xbR5CA9fw09Uuq8sq6CaFPjHwran79tqYX4dTMrlX7ipiQC23SynzpGo5amiyWpIeIG4 CmCRb1uYrFjAart1ngQLoE35kwm8jyxRzFyWYhW11/dJDQlaMbMkABvNpFWg1Qdh8BO3X3 o0jLnG91QVQvQbpuyiPek9YttkTHyfPCIzUbrJPINxryeeK6T8Ortjper4QspQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729194566; a=rsa-sha256; cv=none; b=DreA1qoZFWTEUSCOy1HAxaYXulKhHZggi1b+028eM8yhMSEOQ+CVX+tyG6y/ZpT9ak0VRH CUtuZT/3cNuhZAfKEC9KXyFHbTzapZvjBQlxCsSEKZ3lvZsgoH4teuiRNA6084pYndkFoO IJyS9nuprEBAWvTU4rI9DWoACMKNKjMvNzwCnphaS+b8a13xTZuj8Gk/HJUVLoPS9aDoCY ROSFn/6dqyh5RLzYIItF7gYfdIbIacH70ABpp43l7nOkowr9XpTX7RUs6hGGE2wLjfqdaB 8EIAbMao/1ERxcaKzB75iXPZKEuk0bTHlr1qblglrCZaZewycNzO+pMM9j1FaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XTz1f5cJLz13K8; Thu, 17 Oct 2024 19:49:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49HJnQcm061965; Thu, 17 Oct 2024 19:49:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49HJnQ2R061962; Thu, 17 Oct 2024 19:49:26 GMT (envelope-from git) Date: Thu, 17 Oct 2024 19:49:26 GMT Message-Id: <202410171949.49HJnQ2R061962@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: dac5a2024bc8 - stable/13 - loader: Change version calculation to be more consistent. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: dac5a2024bc8bed379d3db861580056d0c670fdc Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=dac5a2024bc8bed379d3db861580056d0c670fdc commit dac5a2024bc8bed379d3db861580056d0c670fdc Author: Stephen J. Kiernan AuthorDate: 2023-04-17 23:27:54 +0000 Commit: Warner Losh CommitDate: 2024-10-17 19:08:21 +0000 loader: Change version calculation to be more consistent. Use 1000 * major + minor when calculating the version number that gets set in the Ficl environment or lua loader property. This allows for more room if the minor number needs to go above 9. Add loader.version property to lua loader. PR: 282001 Reviewed by: imp Obtained from: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D39631 (cherry picked from commit a50d73d5782a351ad83e8d1f84d11720a12e70d3) --- stand/common/bootstrap.h | 1 + stand/common/interp_forth.c | 1 - stand/common/newvers.sh | 2 +- stand/liblua/lutils.c | 2 ++ 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/stand/common/bootstrap.h b/stand/common/bootstrap.h index 02ddfb84b050..4afab2efa781 100644 --- a/stand/common/bootstrap.h +++ b/stand/common/bootstrap.h @@ -180,6 +180,7 @@ extern int isapnp_readport; * Version information */ extern char bootprog_info[]; +extern unsigned bootprog_rev; /* * Interpreter information diff --git a/stand/common/interp_forth.c b/stand/common/interp_forth.c index 0c2829c9717e..0320e081d406 100644 --- a/stand/common/interp_forth.c +++ b/stand/common/interp_forth.c @@ -31,7 +31,6 @@ #include "bootstrap.h" #include "ficl.h" -extern unsigned bootprog_rev; INTERP_DEFINE("4th"); /* #define BFORTH_DEBUG */ diff --git a/stand/common/newvers.sh b/stand/common/newvers.sh index ee7678597b7a..0f30b1a4a744 100755 --- a/stand/common/newvers.sh +++ b/stand/common/newvers.sh @@ -55,6 +55,6 @@ fi cat > $tempfile <