Skip to content

[ubuntu] Support non-standard kernel version naming #602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jfernandez wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[ubuntu] Support non-standard kernel version naming #602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion ubuntu16.04/nvidia-driver
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,21 @@ _cleanup_package_cache() {

# Resolve the kernel version to the form major.minor.patch-revision-flavor where flavor defaults to generic.
_resolve_kernel_version() {
echo "Resolving Linux kernel version..."

# If headers for the exact running kernel exist, use KERNEL_VERSION as-is.
# This supports non-standard kernel naming (e.g. custom/distro kernels)
# where the upstream version regex would fail.
if apt-cache show "linux-headers-${KERNEL_VERSION}" > /dev/null 2>&1; then
echo "Proceeding with Linux kernel version ${KERNEL_VERSION}"
return 0
fi

local version=$(apt-cache show "linux-headers-${KERNEL_VERSION}" 2> /dev/null | \
sed -nE 's/^Version:\s+(([0-9]+\.){2}[0-9]+)[-.]([0-9]+).*/\1-\3/p' | head -1)
local kernel_flavor=$(echo ${KERNEL_VERSION} | sed 's/[^a-z]*//')
kernel_flavor="${kernel_flavor//virtual/generic}"

echo "Resolving Linux kernel version..."
if [ -z "${version}" ]; then
echo "Could not resolve Linux kernel version" >&2
return 1
Expand Down
11 changes: 10 additions & 1 deletion ubuntu18.04/nvidia-driver
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,21 @@ _cleanup_package_cache() {

# Resolve the kernel version to the form major.minor.patch-revision-flavor where flavor defaults to generic.
_resolve_kernel_version() {
echo "Resolving Linux kernel version..."

# If headers for the exact running kernel exist, use KERNEL_VERSION as-is.
# This supports non-standard kernel naming (e.g. custom/distro kernels)
# where the upstream version regex would fail.
if apt-cache show "linux-headers-${KERNEL_VERSION}" > /dev/null 2>&1; then
echo "Proceeding with Linux kernel version ${KERNEL_VERSION}"
return 0
fi

local version=$(apt-cache show "linux-headers-${KERNEL_VERSION}" 2> /dev/null | \
sed -nE 's/^Version:\s+(([0-9]+\.){2}[0-9]+)[-.]([0-9]+).*/\1-\3/p' | head -1)
local kernel_flavor=$(echo ${KERNEL_VERSION} | sed 's/[^a-z]*//')
kernel_flavor="${kernel_flavor//virtual/generic}"

echo "Resolving Linux kernel version..."
if [ -z "${version}" ]; then
echo "Could not resolve Linux kernel version" >&2
return 1
Expand Down
11 changes: 10 additions & 1 deletion ubuntu20.04/nvidia-driver
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,21 @@ _update_ca_certificates() {

# Resolve the kernel version to the form major.minor.patch-revision-flavor where flavor defaults to generic.
_resolve_kernel_version() {
echo "Resolving Linux kernel version..."

# If headers for the exact running kernel exist, use KERNEL_VERSION as-is.
# This supports non-standard kernel naming (e.g. custom/distro kernels)
# where the upstream version regex would fail.
if apt-cache show "linux-headers-${KERNEL_VERSION}" > /dev/null 2>&1; then
echo "Proceeding with Linux kernel version ${KERNEL_VERSION}"
return 0
fi

local version=$(apt-cache show "linux-headers-${KERNEL_VERSION}" 2> /dev/null | \
sed -nE 's/^Version:\s+(([0-9]+\.){2}[0-9]+)[-.]([0-9]+).*/\1-\3/p' | head -1)
local kernel_flavor=$(echo ${KERNEL_VERSION} | sed 's/[^a-z]*//')
kernel_flavor="${kernel_flavor//virtual/generic}"

echo "Resolving Linux kernel version..."
if [ -z "${version}" ]; then
echo "Could not resolve Linux kernel version" >&2
return 1
Expand Down
11 changes: 10 additions & 1 deletion ubuntu22.04/nvidia-driver
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,21 @@ _update_ca_certificates() {

# Resolve the kernel version to the form major.minor.patch-revision-flavor where flavor defaults to generic.
_resolve_kernel_version() {
echo "Resolving Linux kernel version..."

# If headers for the exact running kernel exist, use KERNEL_VERSION as-is.
# This supports non-standard kernel naming (e.g. custom/distro kernels)
# where the upstream version regex would fail.
if apt-cache show "linux-headers-${KERNEL_VERSION}" > /dev/null 2>&1; then
echo "Proceeding with Linux kernel version ${KERNEL_VERSION}"
return 0
fi

local version=$(apt-cache show "linux-headers-${KERNEL_VERSION}" 2> /dev/null | \
sed -nE 's/^Version:\s+(([0-9]+\.){2}[0-9]+)[-.]([0-9]+).*/\1-\3/p' | head -1)
local kernel_flavor=$(echo ${KERNEL_VERSION} | sed 's/[^a-z]*//')
kernel_flavor="${kernel_flavor//virtual/generic}"

echo "Resolving Linux kernel version..."
if [ -z "${version}" ]; then
echo "Could not resolve Linux kernel version" >&2
return 1
Expand Down
11 changes: 10 additions & 1 deletion ubuntu24.04/nvidia-driver
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,21 @@ _update_ca_certificates() {

# Resolve the kernel version to the form major.minor.patch-revision-flavor where flavor defaults to generic.
_resolve_kernel_version() {
echo "Resolving Linux kernel version..."

# If headers for the exact running kernel exist, use KERNEL_VERSION as-is.
# This supports non-standard kernel naming (e.g. custom/distro kernels)
# where the upstream version regex would fail.
if apt-cache show "linux-headers-${KERNEL_VERSION}" > /dev/null 2>&1; then
echo "Proceeding with Linux kernel version ${KERNEL_VERSION}"
return 0
fi

local version=$(apt-cache show "linux-headers-${KERNEL_VERSION}" 2> /dev/null | \
sed -nE 's/^Version:\s+(([0-9]+\.){2}[0-9]+)[-.]([0-9]+).*/\1-\3/p' | head -1)
local kernel_flavor=$(echo ${KERNEL_VERSION} | sed 's/[^a-z]*//')
kernel_flavor="${kernel_flavor//virtual/generic}"

echo "Resolving Linux kernel version..."
if [ -z "${version}" ]; then
echo "Could not resolve Linux kernel version" >&2
return 1
Expand Down
11 changes: 10 additions & 1 deletion vgpu-manager/ubuntu20.04/nvidia-driver
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,21 @@ _cleanup_package_cache() {

# Resolve the kernel version to the form major.minor.patch-revision-flavor where flavor defaults to generic.
_resolve_kernel_version() {
echo "Resolving Linux kernel version..."

# If headers for the exact running kernel exist, use KERNEL_VERSION as-is.
# This supports non-standard kernel naming (e.g. custom/distro kernels)
# where the upstream version regex would fail.
if apt-cache show "linux-headers-${KERNEL_VERSION}" > /dev/null 2>&1; then
echo "Proceeding with Linux kernel version ${KERNEL_VERSION}"
return 0
fi

local version=$(apt-cache show "linux-headers-${KERNEL_VERSION}" 2> /dev/null | \
sed -nE 's/^Version:\s+(([0-9]+\.){2}[0-9]+)[-.]([0-9]+).*/\1-\3/p' | head -1)
local kernel_flavor=$(echo ${KERNEL_VERSION} | sed 's/[^a-z]*//')
kernel_flavor="${kernel_flavor//virtual/generic}"

echo "Resolving Linux kernel version..."
if [ -z "${version}" ]; then
echo "Could not resolve Linux kernel version" >&2
return 1
Expand Down
11 changes: 10 additions & 1 deletion vgpu-manager/ubuntu22.04/nvidia-driver
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,21 @@ _cleanup_package_cache() {

# Resolve the kernel version to the form major.minor.patch-revision-flavor where flavor defaults to generic.
_resolve_kernel_version() {
echo "Resolving Linux kernel version..."

# If headers for the exact running kernel exist, use KERNEL_VERSION as-is.
# This supports non-standard kernel naming (e.g. custom/distro kernels)
# where the upstream version regex would fail.
if apt-cache show "linux-headers-${KERNEL_VERSION}" > /dev/null 2>&1; then
echo "Proceeding with Linux kernel version ${KERNEL_VERSION}"
return 0
fi

local version=$(apt-cache show "linux-headers-${KERNEL_VERSION}" 2> /dev/null | \
sed -nE 's/^Version:\s+(([0-9]+\.){2}[0-9]+)[-.]([0-9]+).*/\1-\3/p' | head -1)
local kernel_flavor=$(echo ${KERNEL_VERSION} | sed 's/[^a-z]*//')
kernel_flavor="${kernel_flavor//virtual/generic}"

echo "Resolving Linux kernel version..."
if [ -z "${version}" ]; then
echo "Could not resolve Linux kernel version" >&2
return 1
Expand Down
11 changes: 10 additions & 1 deletion vgpu-manager/ubuntu24.04/nvidia-driver
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,21 @@ _cleanup_package_cache() {

# Resolve the kernel version to the form major.minor.patch-revision-flavor where flavor defaults to generic.
_resolve_kernel_version() {
echo "Resolving Linux kernel version..."

# If headers for the exact running kernel exist, use KERNEL_VERSION as-is.
# This supports non-standard kernel naming (e.g. custom/distro kernels)
# where the upstream version regex would fail.
if apt-cache show "linux-headers-${KERNEL_VERSION}" > /dev/null 2>&1; then
echo "Proceeding with Linux kernel version ${KERNEL_VERSION}"
return 0
fi

local version=$(apt-cache show "linux-headers-${KERNEL_VERSION}" 2> /dev/null | \
sed -nE 's/^Version:\s+(([0-9]+\.){2}[0-9]+)[-.]([0-9]+).*/\1-\3/p' | head -1)
local kernel_flavor=$(echo ${KERNEL_VERSION} | sed 's/[^a-z]*//')
kernel_flavor="${kernel_flavor//virtual/generic}"

echo "Resolving Linux kernel version..."
if [ -z "${version}" ]; then
echo "Could not resolve Linux kernel version" >&2
return 1
Expand Down