From: Oliver Kurth <okurth@vmware.com>
Date: Mon, 30 Apr 2018 21:04:14 +0000 (-0700)
Subject: Changes to common header files:
X-Git-Tag: stable-10.3.0~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80a23d71a281493071668fd45b77d7f8248fad68;p=thirdparty%2Fopen-vm-tools.git

Changes to common header files:
- Add Amazon Linux 2 to the known guest OS list.
- Other change not application to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/guest_os_tables.h b/open-vm-tools/lib/include/guest_os_tables.h
index ba82bea7f..917685acc 100644
--- a/open-vm-tools/lib/include/guest_os_tables.h
+++ b/open-vm-tools/lib/include/guest_os_tables.h
@@ -501,6 +501,7 @@ extern "C" {
    GOKM("otherlinux",                           otherLinuxGuest,         TRUE) \
    GOKM("otherlinux-64",                        otherLinux64Guest,       TRUE) \
    GOKM("genericlinux",                         genericLinuxGuest,       TRUE) \
+   GOKM("amazonlinux2-64",                      amazonlinux2_64Guest,    TRUE) \
    /* Netware guests */ \
    GOKM("netware4",                             netware4Guest,           TRUE) \
    GOKM("netware5",                             netware5Guest,           TRUE) \
diff --git a/open-vm-tools/lib/include/vm_product_versions.h b/open-vm-tools/lib/include/vm_product_versions.h
index f34efda9a..231c4e511 100644
--- a/open-vm-tools/lib/include/vm_product_versions.h
+++ b/open-vm-tools/lib/include/vm_product_versions.h
@@ -274,7 +274,8 @@
 #define VIEWVC_VERSION "14.0.0"
 
 /*
- * All of these components should follow the current version of View.
+ * All of these components should follow the current version of View, except
+ * Horizon DaaS Agent which has its own version.
  * SCons parsing code requires that each line have a version string, so we
  * can't just do something like #define RDESDK_VERSION VIEW_VERSION"
  */
@@ -287,6 +288,7 @@
 #define TSMMRDEV_VERSION "7.5.0"
 #define VIEWMPDEV_VERSION "7.5.0"
 #define RDF_VERSION "7.5.0"
+#define HORIZON_DAAS_AGENT_VERSION "18.2.0"
 
 
 #ifndef MAKESTR