From 2af6d0be75c09808dad53b8cedbcf38cc07a87e0 Mon Sep 17 00:00:00 2001
From: Mikhail Efremov <sem@altlinux.org>
Date: Mon, 27 Mar 2017 18:32:09 +0300
Subject: [PATCH] image: Add DISTRO_VERSION variable support

Use it in the image filename, so we'll know what version of a distro
it is.
---
 doc/params.txt    |  5 +++++
 image.in/Makefile | 13 +++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/doc/params.txt b/doc/params.txt
index 62a14a70..32f4ba21 100644
--- a/doc/params.txt
+++ b/doc/params.txt
@@ -60,6 +60,11 @@
 ** значение: пусто (по умолчанию), 1 или 2
 ** см. lib/log.mk, lib/clean.mk
 
+* DISTRO_VERSION
+** задаёт версию дистрибутива, если применимо
+** значение: пусто (по умолчанию) либо любая строка
+** см. image.in/Makefile
+
 * HOMEPAGE, HOMENAME, HOMEWAIT
 ** указывают адрес, название и таймаут перехода для домашней страницы
 ** значение: корректный URL, строка, целое неотрицательное число
diff --git a/image.in/Makefile b/image.in/Makefile
index a2411573..db7c3cbb 100644
--- a/image.in/Makefile
+++ b/image.in/Makefile
@@ -35,9 +35,15 @@ IMAGEDIR := $(wildcard $(IMAGEDIR))
 # additional means to reduce havoc in IMAGEDIR
 IMAGE_SORTDIR := $(wildcard $(SORTDIR))
 
-# reconstruct instead of passing yet another variable
+# use distro version in image name if defined
+ifdef DISTRO_VERSION
+IMAGE_VERSION := -$(DISTRO_VERSION)
+IMAGE_VER_LINK := $(IMAGE_NAME)$(IMAGE_VERSION)-latest-$(ARCH).$(IMAGE_TYPE)
+endif
+
+IMAGE_OUTFILE  := \
+	$(IMAGE_NAME)$(IMAGE_VERSION)-$(STATUS)$(DATE)-$(ARCH).$(IMAGE_TYPE)
 IMAGE_OUTDIR   := $(IMAGEDIR)$(IMAGE_SORTDIR:%=/%)
-IMAGE_OUTFILE  := $(IMAGE_NAME)-$(STATUS)$(DATE)-$(ARCH).$(IMAGE_TYPE)
 IMAGE_OUTPATH  := $(IMAGE_OUTDIR)/$(IMAGE_OUTFILE)
 IMAGE_RELPATH  := $(IMAGE_SORTDIR:%=%/)$(IMAGE_OUTFILE)
 IMAGE_RELDIR   := $(IMAGE_OUTDIR:$(GLOBAL_BUILDDIR)/%=%)
@@ -94,6 +100,9 @@ postprocess: | $(addprefix postprocess-,$(sort $(POSTPROCESS_TARGETS)))
 	ln -sf "$(IMAGE_RELPATH)" "$(IMAGE_LINKPATH)" && \
 	ln -sf "$(IMAGE_RELDIR)" "$(OUT_LINK)" && \
 	ln -sf "$(IMAGE_LINK)" "$(IMAGEDIR)/$(CURRENT_LINK).$(IMAGE_TYPE)"; \
+	if [ -n "$(IMAGE_VER_LINK)" ]; then \
+		ln -sf "$(IMAGE_RELPATH)" "$(IMAGEDIR)/$(IMAGE_VER_LINK)"; \
+	fi; \
 	if [ -n "$(GLOBAL_DEBUG)" ]; then \
 		mkdir -p "$(LOGDIR)"; \
 		cp -a build.log "$(LOGDIR)/$(IMAGE_OUTFILE).log"; \