From 7cb9ed66bee9a5de79bdcf118bced428deaf7037 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Mon, 13 Feb 2023 10:58:47 +0100 Subject: [PATCH] Align release candidate RPM version with Debian version The version for RPM release candidates has the form `1.13.0-0.1.rc.1-1` whereas debian packages have the form `1.13.0~rc.1-1`. Note that since the `~` is handled in [the same way](https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_handling_non_sorting_versions_with_tilde_dot_and_caret) as for Debian packages, there does not seem to be a specific reason for this and dealing with multiple version strings in our entire pipeline adds complexity. This change aligns the package versioning for rpm packages with Debian packages. Signed-off-by: Evan Lezar --- docker/docker.mk | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/docker/docker.mk b/docker/docker.mk index 7ba6efd5..372a3a35 100644 --- a/docker/docker.mk +++ b/docker/docker.mk @@ -88,30 +88,24 @@ docker-all: $(AMD64_TARGETS) $(X86_64_TARGETS) \ LIBNVIDIA_CONTAINER_VERSION ?= $(LIB_VERSION) LIBNVIDIA_CONTAINER_TAG ?= $(LIB_TAG) +LIB_VERSION := $(LIB_VERSION)$(if $(LIB_TAG),~$(LIB_TAG)) +PKG_REV := 1 +LIBNVIDIA_CONTAINER_TOOLS_VERSION := $(LIBNVIDIA_CONTAINER_VERSION)$(if $(LIBNVIDIA_CONTAINER_TAG),~$(LIBNVIDIA_CONTAINER_TAG))-1 + # private ubuntu target --ubuntu%: OS := ubuntu ---ubuntu%: LIB_VERSION := $(LIB_VERSION)$(if $(LIB_TAG),~$(LIB_TAG)) ---ubuntu%: LIBNVIDIA_CONTAINER_TOOLS_VERSION := $(LIBNVIDIA_CONTAINER_VERSION)$(if $(LIBNVIDIA_CONTAINER_TAG),~$(LIBNVIDIA_CONTAINER_TAG))-1 ---ubuntu%: PKG_REV := 1 # private debian target --debian%: OS := debian ---debian%: LIB_VERSION := $(LIB_VERSION)$(if $(LIB_TAG),~$(LIB_TAG)) ---debian%: LIBNVIDIA_CONTAINER_TOOLS_VERSION := $(LIBNVIDIA_CONTAINER_VERSION)$(if $(LIBNVIDIA_CONTAINER_TAG),~$(LIBNVIDIA_CONTAINER_TAG))-1 ---debian%: PKG_REV := 1 # private centos target --centos%: OS := centos ---centos%: PKG_REV := $(if $(LIB_TAG),0.1.$(LIB_TAG),1) ---centos%: LIBNVIDIA_CONTAINER_TOOLS_VERSION := $(LIBNVIDIA_CONTAINER_VERSION)-$(if $(LIBNVIDIA_CONTAINER_TAG),0.1.$(LIBNVIDIA_CONTAINER_TAG),1) --centos%: DOCKERFILE = $(CURDIR)/docker/Dockerfile.rpm-yum --centos%: CONFIG_TOML_SUFFIX := rpm-yum --centos8%: BASEIMAGE = quay.io/centos/centos:stream8 # private fedora target --fedora%: OS := fedora ---fedora%: PKG_REV := $(if $(LIB_TAG),0.1.$(LIB_TAG),1) ---fedora%: LIBNVIDIA_CONTAINER_TOOLS_VERSION := $(LIBNVIDIA_CONTAINER_VERSION)-$(if $(LIBNVIDIA_CONTAINER_TAG),0.1.$(LIBNVIDIA_CONTAINER_TAG),1) --fedora%: DOCKERFILE = $(CURDIR)/docker/Dockerfile.rpm-yum --fedora%: CONFIG_TOML_SUFFIX := rpm-yum # The fedora(35) base image has very slow performance when building aarch64 packages. @@ -120,21 +114,15 @@ LIBNVIDIA_CONTAINER_TAG ?= $(LIB_TAG) # private amazonlinux target --amazonlinux%: OS := amazonlinux ---amazonlinux%: LIBNVIDIA_CONTAINER_TOOLS_VERSION := $(LIBNVIDIA_CONTAINER_VERSION)-$(if $(LIBNVIDIA_CONTAINER_TAG),0.1.$(LIBNVIDIA_CONTAINER_TAG),1) ---amazonlinux%: PKG_REV := $(if $(LIB_TAG),0.1.$(LIB_TAG),1) --amazonlinux%: DOCKERFILE = $(CURDIR)/docker/Dockerfile.rpm-yum --amazonlinux%: CONFIG_TOML_SUFFIX := rpm-yum # private opensuse-leap target --opensuse-leap%: OS = opensuse-leap --opensuse-leap%: BASEIMAGE = opensuse/leap:$(VERSION) ---opensuse-leap%: LIBNVIDIA_CONTAINER_TOOLS_VERSION := $(LIBNVIDIA_CONTAINER_VERSION)-$(if $(LIBNVIDIA_CONTAINER_TAG),0.1.$(LIBNVIDIA_CONTAINER_TAG),1) ---opensuse-leap%: PKG_REV := $(if $(LIB_TAG),0.1.$(LIB_TAG),1) # private rhel target (actually built on centos) --rhel%: OS := centos ---rhel%: LIBNVIDIA_CONTAINER_TOOLS_VERSION := $(LIBNVIDIA_CONTAINER_VERSION)-$(if $(LIBNVIDIA_CONTAINER_TAG),0.1.$(LIBNVIDIA_CONTAINER_TAG),1) ---rhel%: PKG_REV := $(if $(LIB_TAG),0.1.$(LIB_TAG),1) --rhel%: VERSION = $(patsubst rhel%-$(ARCH),%,$(TARGET_PLATFORM)) --rhel%: ARTIFACTS_DIR = $(DIST_DIR)/rhel$(VERSION)/$(ARCH) --rhel%: DOCKERFILE = $(CURDIR)/docker/Dockerfile.rpm-yum