[RHEL7,COMMIT] Makefile: honor VZVERSION env variable if set

Submitted by Konstantin Khorenko on March 6, 2018, 11:32 a.m.

Details

Message ID 201803061132.w26BWE4b005954@finist_ce7.work
State New
Series "Makefile: honor VZVERSION env variable if set"
Headers show

Commit Message

Konstantin Khorenko March 6, 2018, 11:32 a.m.
The commit is pushed to "branch-rh7-3.10.0-693.17.1.vz7.45.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-693.17.1.vz7.45.7
------>
commit 2c98d3f8561c8ebe5266400b3ae60c09ad4a7e6f
Author: Konstantin Khorenko <khorenko@virtuozzo.com>
Date:   Tue Mar 6 14:15:36 2018 +0300

    Makefile: honor VZVERSION env variable if set
    
    If VZVERSION env variable is set, don't override it.
    
    This is useful if someone builds many kernels of different versions,
    but doesn't want to bother cleaning /lib/modules and grub.conf
    on target node (git bisect usecase, for example).
    
    Fixes: b4ea0866cc24 ("Makefile: make VZVERSION evaluated dynamically")
    
    Signed-off-by: Konstantin Khorenko <khorenko@virtuozzo.com>
---
 Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/Makefile b/Makefile
index 64e800ae3574..f4fc2a719ff1 100644
--- a/Makefile
+++ b/Makefile
@@ -14,9 +14,8 @@  RHEL_DRM_VERSION = 4
 RHEL_DRM_PATCHLEVEL = 10
 RHEL_DRM_SUBLEVEL = 13
 # VZVERSION = ovz.45.7
-VZVERSION = ovz.custom
 
-ifeq ($(VZVERSION), ovz.custom)
+ifeq ($(VZVERSION),)
   GIT_DIR := .git
   ifneq ("$(wildcard $(GIT_DIR) )", "")
     VZVERSION := $(shell git describe --abbrev=0 2>/dev/null | \