[Devel] [PATCH RHEL7 COMMIT] Makefile: correct VZVERSION dynamic evaluation

Konstantin Khorenko khorenko at odin.com
Wed May 6 07:12:26 PDT 2015


The commit is pushed to "branch-rh7-3.10.0-123.1.2-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-123.1.2.vz7.4.10
------>
commit a6a666046094f49884420575fae46f0d369edfd6
Author: Konstantin Khorenko <khorenko at openvz.org>
Date:   Wed May 6 18:09:21 2015 +0400

    Makefile: correct VZVERSION dynamic evaluation
    
    As tags lost "el7.ovz" suffix in favour of "vz7" suffix,
    fix VZVERSION dynamic evaluation accordingly.
    
    Signed-off-by: Konstantin Khorenko <khorenko at openvz.org>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 04e9203..bb59d7b 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ RHEL_RELEASE = 123.1.2
 VZVERSION = ovz.custom
 
 ifeq ($(VZVERSION), ovz.custom)
-  VZVERSION := $(shell if [ -d ".git" ]; then git describe | sed -r 's/^.*\.ovz\./ovz./'; fi)
+  VZVERSION := $(shell if [ -d ".git" ]; then git describe | sed -r 's/^.*\.vz7\./ovz./'; fi)
 endif
 
 # *DOCUMENTATION*



More information about the Devel mailing list