From: John Wolfe <jwolfe@vmware.com>
Date: Wed, 30 Jun 2021 18:37:27 +0000 (-0700)
Subject: Changes to a common header file not applicable to open-vm-tools.
X-Git-Tag: stable-12.0.0~167
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9ff40dc4cf48b78cdebe9d05a393bd283429fa0;p=thirdparty%2Fopen-vm-tools.git

Changes to a common header file not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/vm_product_versions.h b/open-vm-tools/lib/include/vm_product_versions.h
index 6f50b76ab..fca9de4d7 100644
--- a/open-vm-tools/lib/include/vm_product_versions.h
+++ b/open-vm-tools/lib/include/vm_product_versions.h
@@ -150,6 +150,11 @@
 #define ESX_RELEASE_QUARTERLY ESX_RELEASE_UPDATE // ESX's own quarterly release
 #define ESX_RELEASE ESX_RELEASE_QUARTERLY "." ESX_RELEASE_PATCH
 
+// ESX release versioning string -
+//    <major>.<minor>.<update>-<quarter>.<patch>.<buildid>
+#define ESX_RELEASE_VERSION_STR ESX_VERSION "-" ESX_RELEASE "." \
+                                XSTR(BUILD_NUMBER_NUMERIC)
+
 #define WORKSTATION_RELEASE_DESCRIPTION ""
 #define P2V_VERSION "e.x.p"
 #define P2V_FILE_VERSION 3,0,0,0
@@ -157,8 +162,6 @@
 /*
  * HEADS UP:  Don't merge patch version bumps (e.g. x.y.0 -> x.y.1) to CBS
  * branches (*-main), 'cuz it breaks stuff in VIX land.  See bug 939456.
- *
- * Whenever WORKSTATION_VERSION_NUMBER and PLAYER_VERSION_NUMBER are changed,
  * necessary VIX changes also need to be done. See bug 939456.
  *
  * ALSO, leave FOO_VERSION at e.x.p on all EXCEPT release branches.