From f94963e5d263fb5c607479e9fdd10fc30db15fcf Mon Sep 17 00:00:00 2001 From: Josh Whitley Date: Thu, 18 Jun 2026 22:50:33 -0600 Subject: [PATCH 1/3] Add Ubuntu 26.04 (resolute) Debian package build support Map the UBUNTU_VERSION codename "resolute" to version number 26.04 so `make pkg-deb UBUNTU_VERSION=resolute` produces a 26.04-tagged package, alongside the existing jammy (22.04) and noble (24.04) targets. The Ubuntu 26.04 base image ships a default non-root user occupying UID 1000, which collides with the host UID the build entrypoint tries to recreate. Detect and remove any pre-existing user holding the requested UID before creating the build user. This is a no-op on 22.04/24.04 images, which have no such default user. Co-Authored-By: Claude Opus 4.8 (1M context) --- Makefile | 4 ++++ tools/deb/base-image/entrypoint.sh | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/Makefile b/Makefile index db56bca..87417df 100644 --- a/Makefile +++ b/Makefile @@ -40,11 +40,15 @@ export ${BUILD_VER_ENV} # 22.04 - jammy # 24.04 - noble +# 26.04 - resolute UBUNTU_VERSION ?= jammy UBUNTU_VERSION_NUMBER = 22.04 ifeq (${UBUNTU_VERSION}, noble) UBUNTU_VERSION_NUMBER = 24.04 endif +ifeq (${UBUNTU_VERSION}, resolute) +UBUNTU_VERSION_NUMBER = 26.04 +endif DEBIAN_VERSION := "1.3.0" diff --git a/tools/deb/base-image/entrypoint.sh b/tools/deb/base-image/entrypoint.sh index 21a1889..a64569b 100644 --- a/tools/deb/base-image/entrypoint.sh +++ b/tools/deb/base-image/entrypoint.sh @@ -22,6 +22,12 @@ sysctl -w vm.max_map_count=262144 if [[ -n "${USER_NAME:-}" && -n "${USER_UID:-}" && -n "${USER_GID:-}" ]]; then echo "Creating user ${USER_NAME} with UID=${USER_UID}, GID=${USER_GID}..." + existing_user="$(getent passwd "$USER_UID" | cut -d: -f1)" + if [[ -n "$existing_user" && "$existing_user" != "$USER_NAME" ]]; then + echo "Removing existing user $existing_user with UID=$USER_UID..." + userdel -r "$existing_user" || userdel "$existing_user" + fi + if ! getent group "$USER_GID" >/dev/null; then groupadd -g "$USER_GID" "$USER_NAME" fi From 976bbb00ab4311a7a3ef80555831aa8b940a7945 Mon Sep 17 00:00:00 2001 From: Shiv Tyagi <67995771+shiv-tyagi@users.noreply.github.com> Date: Thu, 23 Jul 2026 11:18:10 +0000 Subject: [PATCH 2/3] Guard UID lookup so build entrypoint works without a default UID 1000 user --- tools/deb/base-image/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/deb/base-image/entrypoint.sh b/tools/deb/base-image/entrypoint.sh index a64569b..8d1db07 100644 --- a/tools/deb/base-image/entrypoint.sh +++ b/tools/deb/base-image/entrypoint.sh @@ -22,7 +22,7 @@ sysctl -w vm.max_map_count=262144 if [[ -n "${USER_NAME:-}" && -n "${USER_UID:-}" && -n "${USER_GID:-}" ]]; then echo "Creating user ${USER_NAME} with UID=${USER_UID}, GID=${USER_GID}..." - existing_user="$(getent passwd "$USER_UID" | cut -d: -f1)" + existing_user="$(getent passwd "$USER_UID" | cut -d: -f1)" || true if [[ -n "$existing_user" && "$existing_user" != "$USER_NAME" ]]; then echo "Removing existing user $existing_user with UID=$USER_UID..." userdel -r "$existing_user" || userdel "$existing_user" From b7f87b025ba4225ea513202232f48a86aaa14454 Mon Sep 17 00:00:00 2001 From: Shiv Tyagi <67995771+shiv-tyagi@users.noreply.github.com> Date: Wed, 29 Jul 2026 04:09:14 +0000 Subject: [PATCH 3/3] Document Ubuntu 26.04 support for 1.3.0 Ubuntu 26.04 (Resolute) packages are already published for 1.3.0 on repo.radeon.com and install cleanly, but the docs still listed only 22.04 and 24.04. Add 26.04 to the supported OS list, the 1.3.0 compatibility matrix row, and the README requirements. Older matrix rows are left unchanged since those releases were never built for 26.04. No version bump is needed. 26.04 support came from the build matrix addition in #134, not a code change. --- README.md | 2 +- docs/container-runtime/release-notes.rst | 2 +- docs/container-runtime/requirements.rst | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8075b60..fd58914 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ For comprehensive documentation including installation, configuration, CDI, Swar ## Requirements -- Ubuntu 22.04 or 24.04, or RHEL/CentOS 9 +- Ubuntu 22.04, 24.04, or 26.04, or RHEL/CentOS 9 - Docker version 25 or later - All `amd-ctk runtime configure` commands should be run as root/sudo diff --git a/docs/container-runtime/release-notes.rst b/docs/container-runtime/release-notes.rst index 97b3178..c5cbebb 100644 --- a/docs/container-runtime/release-notes.rst +++ b/docs/container-runtime/release-notes.rst @@ -14,7 +14,7 @@ Compatibility Matrix - Supported OS * - 1.3.0 - 25.0+ - - Ubuntu 22.04, Ubuntu 24.04 + - Ubuntu 22.04, Ubuntu 24.04, Ubuntu 26.04 * - 1.2.0 - 25.0+ - Ubuntu 22.04, Ubuntu 24.04 diff --git a/docs/container-runtime/requirements.rst b/docs/container-runtime/requirements.rst index 0391247..c9eff1d 100644 --- a/docs/container-runtime/requirements.rst +++ b/docs/container-runtime/requirements.rst @@ -7,6 +7,7 @@ Supported Operating Systems --------------------------- - Ubuntu 22.04 LTS (Jammy Jellyfish) - Ubuntu 24.04 LTS (Noble Numbat) +- Ubuntu 26.04 LTS (Resolute Raccoon) - RHEL 9.5 .. note::