@@ -54,10 +54,10 @@ OUT_IMAGE_TAG = $(OUT_IMAGE_VERSION)-$(OUT_DIST)
5454OUT_IMAGE = $(OUT_IMAGE_NAME ) :$(OUT_IMAGE_TAG )
5555
5656# #### Public rules #####
57- DISTRIBUTIONS := ubuntu22.04 ubuntu24.04 signed_ubuntu22.04 signed_ubuntu24.04 rhel8 rhel9 rhel10 rocky8 rocky9 rocky10 precompiled_rhcos
57+ DISTRIBUTIONS := ubuntu22.04 ubuntu24.04 signed_ubuntu22.04 signed_ubuntu24.04 signed_ubuntu26.04 rhel8 rhel9 rhel10 rocky8 rocky9 rocky10 precompiled_rhcos
5858RHCOS_VERSIONS := rhcos4.14 rhcos4.15 rhcos4.16 rhcos4.17 rhcos4.18 rhel9.6
5959PUSH_TARGETS := $(patsubst % , push-% , $(DISTRIBUTIONS ) )
60- BASE_FROM := noble jammy
60+ BASE_FROM := resolute noble jammy
6161PUSH_TARGETS := $(patsubst % , push-% , $(DISTRIBUTIONS ) )
6262VGPU_GUEST_DRIVER_PUSH_TARGETS := $(patsubst % , push-vgpuguest-% , $(DISTRIBUTIONS ) $(RHCOS_VERSIONS ) )
6363VGPU_HOST_DRIVER_PUSH_TARGETS := $(patsubst % , push-vgpuhost-% , $(DISTRIBUTIONS ) $(RHCOS_VERSIONS ) )
@@ -98,6 +98,10 @@ pull-signed_ubuntu24.04%: DIST = ubuntu24.04
9898pull-signed_ubuntu24.04% : DRIVER_TAG = $(DRIVER_BRANCH )
9999pull-signed_ubuntu24.04% : IMAGE_TAG = $(DRIVER_BRANCH ) -$(KERNEL_VERSION ) -$(DIST )
100100
101+ pull-signed_ubuntu26.04% : DIST = ubuntu26.04
102+ pull-signed_ubuntu26.04% : DRIVER_TAG = $(DRIVER_BRANCH )
103+ pull-signed_ubuntu26.04% : IMAGE_TAG = $(DRIVER_BRANCH ) -$(KERNEL_VERSION ) -$(DIST )
104+
101105PLATFORM ?= linux/amd64
102106$(DRIVER_PULL_TARGETS ) : pull-% :
103107 $(DOCKER ) pull " --platform=$( PLATFORM) " " $( IMAGE) "
@@ -116,6 +120,10 @@ archive-signed_ubuntu24.04%: DIST = ubuntu24.04
116120archive-signed_ubuntu24.04% : DRIVER_TAG = $(DRIVER_BRANCH )
117121archive-signed_ubuntu24.04% : IMAGE_TAG = $(if $(VERSION ) ,$(VERSION ) -)$(DRIVER_BRANCH ) -$(KERNEL_VERSION ) -$(DIST )
118122
123+ archive-signed_ubuntu26.04% : DIST = ubuntu26.04
124+ archive-signed_ubuntu26.04% : DRIVER_TAG = $(DRIVER_BRANCH )
125+ archive-signed_ubuntu26.04% : IMAGE_TAG = $(if $(VERSION ) ,$(VERSION ) -)$(DRIVER_BRANCH ) -$(KERNEL_VERSION ) -$(DIST )
126+
119127$(DRIVER_ARCHIVE_TARGETS ) : archive-% :
120128 $(DOCKER ) save " $( IMAGE) " -o " archive.tar"
121129
@@ -139,6 +147,11 @@ push-signed_ubuntu24.04%: DRIVER_TAG = $(DRIVER_BRANCH)
139147push-signed_ubuntu24.04% : IMAGE_TAG = $(if $(VERSION ) ,$(VERSION ) -)$(DRIVER_BRANCH ) -$(KERNEL_VERSION ) -$(DIST )
140148push-signed_ubuntu24.04% : OUT_IMAGE_TAG = $(if $(VERSION ) ,$(VERSION ) -)$(DRIVER_BRANCH ) -$(KERNEL_VERSION ) -$(DIST )
141149
150+ push-signed_ubuntu26.04% : DIST = ubuntu26.04
151+ push-signed_ubuntu26.04% : DRIVER_TAG = $(DRIVER_BRANCH )
152+ push-signed_ubuntu26.04% : IMAGE_TAG = $(if $(VERSION ) ,$(VERSION ) -)$(DRIVER_BRANCH ) -$(KERNEL_VERSION ) -$(DIST )
153+ push-signed_ubuntu26.04% : OUT_IMAGE_TAG = $(if $(VERSION ) ,$(VERSION ) -)$(DRIVER_BRANCH ) -$(KERNEL_VERSION ) -$(DIST )
154+
142155# $(DRIVER_BUILD_TARGETS) is in the form of build-$(DIST)-$(DRIVER_VERSION)
143156# Parse the target to set the required variables.
144157build-% : DIST = $(word 2,$(subst -, ,$@ ) )
@@ -191,6 +204,14 @@ build-signed_ubuntu24.04%: DRIVER_TAG = $(DRIVER_BRANCH)
191204build-signed_ubuntu24.04% : IMAGE_TAG = $(if $(VERSION ) ,$(VERSION ) -)$(DRIVER_BRANCH ) -$(KERNEL_VERSION ) -$(DIST )
192205build-signed_ubuntu24.04% : DOCKER_BUILD_ARGS = --build-arg KERNEL_VERSION="$(KERNEL_VERSION ) "
193206
207+ # ubuntu26.04 Precompiled Driver
208+ build-signed_ubuntu26.04% : DIST = ubuntu26.04
209+ build-signed_ubuntu26.04% : SUBDIR = .
210+ build-signed_ubuntu26.04% : DOCKERFILE = $(CURDIR ) /ubuntu26.04/precompiled/Dockerfile
211+ build-signed_ubuntu26.04% : DRIVER_TAG = $(DRIVER_BRANCH )
212+ build-signed_ubuntu26.04% : IMAGE_TAG = $(if $(VERSION ) ,$(VERSION ) -)$(DRIVER_BRANCH ) -$(KERNEL_VERSION ) -$(DIST )
213+ build-signed_ubuntu26.04% : DOCKER_BUILD_ARGS = --build-arg KERNEL_VERSION="$(KERNEL_VERSION ) "
214+
194215# base is an image used to poll Canonical for the latest kernel version
195216# LTS_KERNEL must be defined in the environment when invoking this target.
196217LTS_KERNEL ?= ""
@@ -298,4 +319,3 @@ $(VGPU_HOST_DRIVER_BUILD_TARGETS):
298319push-vgpuhost-% : $(if $(VGPU_HOST_DRIVER_VERSION ) ,,$(error "VGPU_HOST_DRIVER_VERSION is not set") )
299320push-vgpuhost-% : DRIVER_TAG = $(VGPU_HOST_DRIVER_VERSION )
300321push-vgpuhost-% : DIST = $(word 3,$(subst -, ,$@ ) )
301-
0 commit comments