From nobody Wed Apr 19 17:59:47 2023 X-Original-To: dev-commits-src-main@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 4Q1pTc1Z4zz46GZp; Wed, 19 Apr 2023 17:59:48 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q1pTc0Hq9z4MsT; Wed, 19 Apr 2023 17:59:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681927188; 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=mL/sO6WgaD/SktClszJM8ekJ6m1V24C4zF/IUC0NaYQ=; b=b/YB4xKUtAvR058A0LUsUlNXM2TSGYb+ZYUyYYEaXrMaOrlKxM+y7P3kYEQ+hfeOfVqqbg ZzhgUhOoGi3o7Zp+4IaIIGEnIcc/RP6h71hq2UcrcssMcV1aiyfUHNJn2YB23t3x9tnWfU 0IOlpeHULNDg4u+xnUKczcdg4+kfz8vZAM71oodL3M3WbrBA8CxbYX2I33vOdyXNlXC45d bOAnz6XaFhjZccW2fRV4pb3uS5+xJ+BzirsmBa71hZNkG95NOjXnCUoXZ9ajJOEWg2Zf8J cRilM1rC7qVMq2VmZRcpqcEqSLFqTsTwbYz07QZ0IlM15TYSGx6RWQ5U5Jmwcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681927188; 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=mL/sO6WgaD/SktClszJM8ekJ6m1V24C4zF/IUC0NaYQ=; b=b2eHwh+ET9u9MHDxWGTIzbqxU+l/RBGS9j+M3Qj+mW79Uzmnv76iep6LFIEWTgZmL1l4Qf OvTx4B/RfHe1sym77DfNtp4ztER0p1LYQPYHa3T2m7jNbtGVJRWEK1GoNdLfr/tg1q527i 8cYrmixxN34Da8793yOl1HzWu39p8+/NDYnaKB9AqiFFECVDjtX5vOURbxULFuhL9xiBrh 5yapih6NbJXgFAAAsBtm+jSL57f5Bb1ZuUJ3+Zt8EjGSLuPY7aM9TuMlPSS4hUiPms/AJd o9oGo5d3k2+9+jP9YGnPBW2g+FkIMCu9tHSteJU8qGulGrYrhiabtMvIXCalMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681927188; a=rsa-sha256; cv=none; b=q2dRcWRnDAn51/V1cZevw0fOASK2MoMaRBY6HJlU3P3GChlEoK18/kj55acWGpaHVJLM9v Ql4rw/cPuuQC20ozwYk+hsGqrfhRGeyfDU1YbcTo7HGSnOKqIKfzFACT0EvAzTAQSI8SMR wzUdnCDduIBvp3244NYpe8aXMkTiwqx0ozN06ABTPD7FF9wJIWvu2QkVALVNeBEqyMtuvm 8CQY3X3A7IWji7sxp8uMHOrjnIpA6TwM7DXFq32fUza6r0Lg0PQ1ZjFztt6IAM3KXduaXS GEf7Upl5pZqXZeE0S3OqbF19jHRG0al0rSb76WRymDSJn7U+AFafGCinxH2Xvg== 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 4Q1pTb6SzWz14Vj; Wed, 19 Apr 2023 17:59:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33JHxlGS038549; Wed, 19 Apr 2023 17:59:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33JHxlGe038548; Wed, 19 Apr 2023 17:59:47 GMT (envelope-from git) Date: Wed, 19 Apr 2023 17:59:47 GMT Message-Id: <202304191759.33JHxlGe038548@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Stephen J. Kiernan" Subject: git: a50d73d5782a - main - loader: Change version calculation to be more consistent. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: stevek X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a50d73d5782a351ad83e8d1f84d11720a12e70d3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by stevek: URL: https://cgit.FreeBSD.org/src/commit/?id=a50d73d5782a351ad83e8d1f84d11720a12e70d3 commit a50d73d5782a351ad83e8d1f84d11720a12e70d3 Author: Stephen J. Kiernan AuthorDate: 2023-04-17 23:27:54 +0000 Commit: Stephen J. Kiernan CommitDate: 2023-04-19 17:58:53 +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. Reviewed by: imp Obtained from: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D39631 --- 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 80c1a2352b3c..d62a936e6ff0 100644 --- a/stand/common/bootstrap.h +++ b/stand/common/bootstrap.h @@ -182,6 +182,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 19f1c75dc191..edf21e53dc18 100644 --- a/stand/common/interp_forth.c +++ b/stand/common/interp_forth.c @@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$"); #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 714adba6c9cb..1a3ceb91af17 100755 --- a/stand/common/newvers.sh +++ b/stand/common/newvers.sh @@ -57,6 +57,6 @@ fi cat > $tempfile <