fix: remove kernel version pin — dynamic detection prevents KVER mismatch
The static KERNEL_PKG_VERSION pin was the root cause of nvidia-smi never working: modules were compiled for pinned version (e.g. 6.12.76-r0) but the ISO kernel was unpinned (latest from repo at build time). When Alpine updated linux-lts, the two diverged silently. Fix: both steps now use whatever linux-lts is current in Alpine 3.21 main at build time. build-nvidia-module.sh uses `apk add --update linux-lts-dev` (no version pin), mkimage gets the same package from the same mirror. Module cache is still keyed by detected KVER so rebuilds remain fast. Removed: KERNEL_VERSION, KERNEL_PKG_VERSION from VERSIONS, all pin references from build.sh and build-nvidia-module.sh. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -16,20 +16,19 @@ set -e
|
||||
|
||||
NVIDIA_VERSION="$1"
|
||||
DIST_DIR="$2"
|
||||
KERNEL_PKG_VERSION="$3"
|
||||
ALPINE_VERSION="$4"
|
||||
ALPINE_VERSION="$3"
|
||||
|
||||
[ -n "$NVIDIA_VERSION" ] || { echo "usage: $0 <nvidia-version> <dist-dir> <kernel-pkg-version> <alpine-version>"; exit 1; }
|
||||
[ -n "$DIST_DIR" ] || { echo "usage: $0 <nvidia-version> <dist-dir> <kernel-pkg-version> <alpine-version>"; exit 1; }
|
||||
[ -n "$KERNEL_PKG_VERSION" ] || { echo "usage: $0 <nvidia-version> <dist-dir> <kernel-pkg-version> <alpine-version>"; exit 1; }
|
||||
[ -n "$ALPINE_VERSION" ] || { echo "usage: $0 <nvidia-version> <dist-dir> <kernel-pkg-version> <alpine-version>"; exit 1; }
|
||||
[ -n "$NVIDIA_VERSION" ] || { echo "usage: $0 <nvidia-version> <dist-dir> <alpine-version>"; exit 1; }
|
||||
[ -n "$DIST_DIR" ] || { echo "usage: $0 <nvidia-version> <dist-dir> <alpine-version>"; exit 1; }
|
||||
[ -n "$ALPINE_VERSION" ] || { echo "usage: $0 <nvidia-version> <dist-dir> <alpine-version>"; exit 1; }
|
||||
|
||||
# Install the EXACT pinned linux-lts-dev version so builder headers always match ISO kernel.
|
||||
# Use dl-cdn.alpinelinux.org — same source as mkimage. If unavailable, apk fails loudly.
|
||||
echo "=== installing linux-lts-dev=${KERNEL_PKG_VERSION} ==="
|
||||
apk add --quiet \
|
||||
# Install linux-lts-dev (no version pin — always use whatever is current in Alpine 3.21 main).
|
||||
# This ensures modules are compiled for the same kernel that mkimage will install in the ISO.
|
||||
# Both use dl-cdn.alpinelinux.org, so they see the same package state at build time.
|
||||
echo "=== installing linux-lts-dev (latest from dl-cdn) ==="
|
||||
apk add --quiet --update \
|
||||
--repository "https://dl-cdn.alpinelinux.org/alpine/v${ALPINE_VERSION}/main" \
|
||||
"linux-lts-dev=${KERNEL_PKG_VERSION}"
|
||||
linux-lts-dev
|
||||
|
||||
# Detect kernel version from installed headers (pick highest version if multiple).
|
||||
detect_kver() {
|
||||
@@ -52,10 +51,10 @@ if [ -d "$CACHE_DIR/modules" ] && [ -f "$CACHE_DIR/bin/nvidia-smi" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Install build dependencies (linux-lts-dev pinned, same dl-cdn source)
|
||||
# Install build dependencies (linux-lts-dev already at correct version from above)
|
||||
apk add --quiet \
|
||||
--repository "https://dl-cdn.alpinelinux.org/alpine/v${ALPINE_VERSION}/main" \
|
||||
gcc make perl "linux-lts-dev=${KERNEL_PKG_VERSION}" wget
|
||||
gcc make perl linux-lts-dev wget
|
||||
|
||||
# Download official NVIDIA .run installer (proprietary) with sha256 verification
|
||||
BASE_URL="https://download.nvidia.com/XFree86/Linux-x86_64/${NVIDIA_VERSION}"
|
||||
|
||||
Reference in New Issue
Block a user