From: Oliver Kurth <okurth@vmware.com>
Date: Tue, 19 Feb 2019 20:51:32 +0000 (-0800)
Subject: Back out the previous change to bump up the SYSIMAGE_VERSION to be the same
X-Git-Tag: stable-11.0.0~207
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c18ef48a57aeb73c7ac970336c3a7c199744de1;p=thirdparty%2Fopen-vm-tools.git

Back out the previous change to bump up the SYSIMAGE_VERSION to be the same
with 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 5ad947e16..de0fddc70 100644
--- a/open-vm-tools/lib/include/vm_product_versions.h
+++ b/open-vm-tools/lib/include/vm_product_versions.h
@@ -55,9 +55,8 @@
    // WORKSTATION_VERSION_NUMBER below has to match this
    #define PRODUCT_VERSION    15,0,0,PRODUCT_BUILD_NUMBER_NUMERIC
 #elif defined(VMX86_SYSIMAGE)
-   #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
+   // SYSIMAGE_VERSION below has to match this
+   #define PRODUCT_VERSION    8,5,0,PRODUCT_BUILD_NUMBER_NUMERIC
 #else
    /* Generic catch-all. */
    #define PRODUCT_VERSION    0,0,0,PRODUCT_BUILD_NUMBER_NUMERIC
@@ -176,6 +175,11 @@
  */
 #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.4"
 /*
  *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 34b47b026..72dd3aef9 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-2019 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2016,2018 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) || defined(VMX86_SYSIMAGE)
+#if defined(VMX86_TOOLS)
 #include "vm_tools_version.h"
 #endif
 #include "vm_vmx_type.h"