@@ -54,7 +54,7 @@ OUT_IMAGE_TAG = $(OUT_IMAGE_VERSION)-$(OUT_DIST)
5454OUT_IMAGE = $(OUT_IMAGE_NAME ) :$(OUT_IMAGE_TAG )
5555
5656# #### Public rules #####
57- DISTRIBUTIONS := ubuntu18.04 ubuntu20.04 ubuntu22.04 ubuntu24.04 signed_ubuntu20.04 signed_ubuntu22.04 signed_ubuntu24.04 rhel8 rhel9 rhel10 rocky9 flatcar fedora36 sles15.3 precompiled_rhcos
57+ DISTRIBUTIONS := ubuntu22.04 ubuntu24.04 signed_ubuntu22.04 signed_ubuntu24.04 rhel8 rhel9 rhel10 rocky9 precompiled_rhcos
5858RHCOS_VERSIONS := rhcos4.14 rhcos4.15 rhcos4.16 rhcos4.17 rhcos4.18 rhel9.6
5959PUSH_TARGETS := $(patsubst % , push-% , $(DISTRIBUTIONS ) )
6060BASE_FROM := noble jammy focal
@@ -90,9 +90,6 @@ pull-%: DRIVER_BRANCH = $(word 1,$(subst ., ,${DRIVER_VERSION}))
9090
9191$(PULL_TARGETS ) : % : $(foreach driver_version, $(DRIVER_VERSIONS ) , $(addprefix % -, $(driver_version ) ) )
9292
93- pull-signed_ubuntu20.04% : DIST = signed-ubuntu20.04
94- pull-signed_ubuntu20.04% : DRIVER_TAG = $(DRIVER_BRANCH )
95-
9693pull-signed_ubuntu22.04% : DIST = ubuntu22.04
9794pull-signed_ubuntu22.04% : DRIVER_TAG = $(DRIVER_BRANCH )
9895pull-signed_ubuntu22.04% : IMAGE_TAG = $(DRIVER_BRANCH ) -$(KERNEL_VERSION ) -$(DIST )
@@ -111,9 +108,6 @@ archive-%: DRIVER_BRANCH = $(word 1,$(subst ., ,${DRIVER_VERSION}))
111108
112109$(ARCHIVE_TARGETS ) : % : $(foreach driver_version, $(DRIVER_VERSIONS ) , $(addprefix % -, $(driver_version ) ) )
113110
114- archive-signed_ubuntu20.04% : DIST = signed-ubuntu20.04
115- archive-signed_ubuntu20.04% : DRIVER_TAG = $(DRIVER_BRANCH )
116-
117111archive-signed_ubuntu22.04% : DIST = ubuntu22.04
118112archive-signed_ubuntu22.04% : DRIVER_TAG = $(DRIVER_BRANCH )
119113archive-signed_ubuntu22.04% : IMAGE_TAG = $(if $(VERSION ) ,$(VERSION ) -)$(DRIVER_BRANCH ) -$(KERNEL_VERSION ) -$(DIST )
@@ -131,13 +125,10 @@ push-%: DIST = $(word 2,$(subst -, ,$@))
131125push-% : DRIVER_VERSION = $(word 3,$(subst -, ,$@ ) )
132126push-% : DRIVER_BRANCH = $(word 1,$(subst ., ,${DRIVER_VERSION}) )
133127
134- # push-ubuntu20 .04 pushes all driver images for ubuntu20 .04
135- # push-ubuntu20 .04-$(DRIVER_VERSION) pushes an image for the specific $(DRIVER_VERSION)
128+ # push-ubuntu22 .04 pushes all driver images for ubuntu22 .04
129+ # push-ubuntu22 .04-$(DRIVER_VERSION) pushes an image for the specific $(DRIVER_VERSION)
136130$(PUSH_TARGETS ) : % : $(foreach driver_version, $(DRIVER_VERSIONS ) , $(addprefix % -, $(driver_version ) ) )
137131
138- push-signed_ubuntu20.04% : DIST = signed-ubuntu20.04
139- push-signed_ubuntu20.04% : DRIVER_TAG = $(DRIVER_BRANCH )
140-
141132push-signed_ubuntu22.04% : DIST = ubuntu22.04
142133push-signed_ubuntu22.04% : DRIVER_TAG = $(DRIVER_BRANCH )
143134push-signed_ubuntu22.04% : IMAGE_TAG = $(if $(VERSION ) ,$(VERSION ) -)$(DRIVER_BRANCH ) -$(KERNEL_VERSION ) -$(DIST )
@@ -156,8 +147,8 @@ build-%: DRIVER_BRANCH = $(word 1,$(subst ., ,${DRIVER_VERSION}))
156147build-% : SUBDIR = $(word 2,$(subst -, ,$@ ) )
157148build-% : DOCKERFILE = $(CURDIR ) /$(SUBDIR ) /Dockerfile
158149
159- # Both ubuntu20 .04 and build-ubuntu20 .04 trigger a build of all driver images for ubuntu20 .04
160- # build-ubuntu20 .04-$(DRIVER_VERSION) triggers a build for a specific $(DRIVER_VERSION)
150+ # Both ubuntu22 .04 and build-ubuntu22 .04 trigger a build of all driver images for ubuntu22 .04
151+ # build-ubuntu22 .04-$(DRIVER_VERSION) triggers a build for a specific $(DRIVER_VERSION)
161152$(DISTRIBUTIONS ) : % : build-%
162153$(BUILD_TARGETS ) : % : $(foreach driver_version, $(DRIVER_VERSIONS ) , $(addprefix % -, $(driver_version ) ) )
163154$(DRIVER_BUILD_TARGETS ) :
@@ -180,16 +171,6 @@ build-rhcos%: SUBDIR = rhel9
180171build-rocky9% : SUBDIR = rhel9
181172build-rocky9% : DOCKER_BUILD_ARGS = --build-arg BASE_IMAGE=nvcr.io/nvidia/cuda:13.2.1-base-rockylinux9
182173
183- build-fedora% : SUBDIR = fedora
184-
185- build-sles15% : SUBDIR = sle15
186- build-sles% : DOCKER_BUILD_ARGS = --build-arg SLES_VERSION=$(subst sles,,$(word 2,$(subst -, ,$@ ) ) )
187-
188- # ubuntu20.04 Precompiled Driver
189- build-signed_ubuntu20.04% : DIST = signed-ubuntu20.04
190- build-signed_ubuntu20.04% : SUBDIR = ubuntu20.04/precompiled
191- build-signed_ubuntu20.04% : DRIVER_TAG = $(DRIVER_BRANCH )
192-
193174# ubuntu22.04 Precompiled Driver
194175build-signed_ubuntu22.04% : DIST = ubuntu22.04
195176build-signed_ubuntu22.04% : SUBDIR = ubuntu22.04/precompiled
0 commit comments