OpenAFS Master Repository branch, master, updated. openafs-devel-1_9_2-811-gb52bb66
Gerrit Code Review
gerrit@openafs.org
Fri, 13 Nov 2026 10:35:47 -0500
The following commit has been merged in the master branch:
commit b52bb66a087d6e0c5c42b40512b504359ca331b2
Author: Michael Meffie <mmeffie@sinenomine.net>
Date: Fri Oct 30 12:20:45 2026 -0400
macos: Derive MACOS_VERSION from the git version
MACOS_VERSION specifies the version number of the OpenAFS kernel
extension included in the macOS package:
$ kextstat
Index Refs Address Size Wired Name (Version) UUID <Linked Against>
251 0 0 0x9d44 0x9d44 org.openafs.filesystems.afs (1.9.2)
It is hard coded in configure.ac and configure-libafs.ac and must be
updated by hand for each release.
macOS only accepts versions of the form N.N.N[{d|a|b|fc}N], where the
optional suffix marks a development, alpha, beta, or final candidate
build. Sorting rules are used to determine newer versions.
The convention used to transform OpenAFS versions to macOS versions is:
X.Y.ZpreN -> X.Y.ZfcN a pre-release; sorts before X.Y.Z
X.Y.Z -> X.Y.Z regular release
X.Y.Z.N -> X.Y.(Z+1)dN a point release; sorts after X.Y.Z and
before X.Y.(Z+1)
When doing builds between versions, git-version adds the suffix
"-<number-of-commits>-g<abbreviated-commit-hash>" to the version string.
This suffix is ignored when determining the MACOS_VERSION.
Add the build-tools/mac-version.sh script to convert an OpenAFS version
string to a macOS version, and run it with m4_esyscmd() in configure.ac
and configure-libafs.ac, as is done for git-version, so MACOS_VERSION
is set when regen.sh generates the configure scripts. The script can
be run directly to check the conversion:
./build-tools/mac-version.sh `./build-tools/git-version .`
Update the 'make-version.py' script used to manually update
MACOS_VERSION in the configure files, to skip macOS update when the
lines are not present instead of failing.
Change-Id: I8347252684761a50f981742334c54b8609c352bb
Assisted-by: Claude:claude-opus-5-5
Reviewed-on: https://gerrit.openafs.org/17174
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Cheyenne Wills <cwills@sinenomine.net>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
build-tools/libafsdep | 1 +
build-tools/mac-version.sh | 62 +++++++++++++++++++++++++++++++++++++++++++++
build-tools/make-version.py | 17 +++++++++++++
configure-libafs.ac | 5 ++--
configure.ac | 5 ++--
5 files changed, 84 insertions(+), 6 deletions(-)
--
OpenAFS Master Repository