From: Oliver Kurth <okurth@vmware.com>
Date: Tue, 19 Feb 2019 20:51:33 +0000 (-0800)
Subject: Bump up the SYSIMAGE_VERSION to be same as the VMTools version.
X-Git-Tag: stable-11.0.0~187
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a013addd657dda0d6671b7ea64c4a0793f57d18;p=thirdparty%2Fopen-vm-tools.git

Bump up the SYSIMAGE_VERSION to be same as the VMTools version.
---

diff --git a/open-vm-tools/lib/include/vm_product_versions.h b/open-vm-tools/lib/include/vm_product_versions.h
index 151c8dc1f..5202f344f 100644
--- a/open-vm-tools/lib/include/vm_product_versions.h
+++ b/open-vm-tools/lib/include/vm_product_versions.h
@@ -55,8 +55,9 @@
    // WORKSTATION_VERSION_NUMBER below has to match this
    #define PRODUCT_VERSION    15,0,0,PRODUCT_BUILD_NUMBER_NUMERIC
 #elif defined(VMX86_SYSIMAGE)
-   // SYSIMAGE_VERSION below has to match this
-   #define PRODUCT_VERSION    8,5,0,PRODUCT_BUILD_NUMBER_NUMERIC
+   #define PRODUCT_VERSION    TOOLS_VERSION_EXT_CURRENT_CSV
+   #define SYSIMAGE_VERSION TOOLS_VERSION_CURRENT_STR
+   #define SYSIMAGE_VERSION_EXT_STR TOOLS_VERSION_EXT_CURRENT_STR
 #else
    /* Generic catch-all. */
    #define PRODUCT_VERSION    0,0,0,PRODUCT_BUILD_NUMBER_NUMERIC
@@ -174,11 +175,6 @@
  */
 #define FUSION_VERSION "e.x.p"
 
-// These must match PRODUCT_VERSION for VMX86_SYSIMAGE above
-#define SYSIMAGE_VERSION "8.5.0"
-#define SYSIMAGE_VERSION_EXT_STR \
-   SYSIMAGE_VERSION "." PRODUCT_BUILD_NUMBER_NUMERIC_STRING
-
 #define VIM_VERSION "6.8.5"
 /*
  *For smooth version bump up for quaterly releases, we need to have a fallback
diff --git a/open-vm-tools/lib/include/vm_version.h b/open-vm-tools/lib/include/vm_version.h
index 72dd3aef9..34b47b026 100644
--- a/open-vm-tools/lib/include/vm_version.h
+++ b/open-vm-tools/lib/include/vm_version.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2016,2018 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2019 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -33,7 +33,7 @@
 #define INCLUDE_ALLOW_VMCORE
 #include "includeCheck.h"
 #include "vm_product.h"
-#if defined(VMX86_TOOLS)
+#if defined(VMX86_TOOLS) || defined(VMX86_SYSIMAGE)
 #include "vm_tools_version.h"
 #endif
 #include "vm_vmx_type.h"