From 2dc85de5d4e8ab81a401ab32c73ce02e6e8d832c Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Thu, 23 Sep 2021 15:36:27 +0200 Subject: [PATCH] Use consistent package revisions for all rpm-based packages Signed-off-by: Evan Lezar --- docker/docker.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/docker.mk b/docker/docker.mk index 935d8181..f1188107 100644 --- a/docker/docker.mk +++ b/docker/docker.mk @@ -97,11 +97,11 @@ docker-all: $(AMD64_TARGETS) $(X86_64_TARGETS) \ # private centos target --centos%: OS := centos ---centos%: PKG_REV := $(if $(LIB_TAG),0.1.$(LIB_TAG),2) +--centos%: PKG_REV := $(if $(LIB_TAG),0.1.$(LIB_TAG),1) # private amazonlinux target --amazonlinux%: OS := amazonlinux ---amazonlinux%: PKG_REV = $(if $(LIB_TAG),0.1.$(LIB_TAG).amzn$(VERSION),2.amzn$(VERSION)) +--amazonlinux%: PKG_REV := $(if $(LIB_TAG),0.1.$(LIB_TAG),1) # private opensuse-leap target --opensuse-leap%: OS = opensuse-leap @@ -110,7 +110,7 @@ docker-all: $(AMD64_TARGETS) $(X86_64_TARGETS) \ # private rhel target (actually built on centos) --rhel%: OS := centos ---rhel%: PKG_REV := $(if $(LIB_TAG),0.1.$(LIB_TAG),2) +--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)