From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 5 Jan 2018 22:47:15 +0000 (-0800)
Subject: Consume vmx headear files in bora tree instead of gosc's own copy
X-Git-Tag: stable-10.3.0~185
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2674b02449875b04889be00400f52351105ab25f;p=thirdparty%2Fopen-vm-tools.git

Consume vmx headear files in bora tree instead of gosc's own copy

1. Consuming header files from bora/vmx instead of gosc/vmx
2. Deprecated "gosc/vmx/public/toolsdDeployPkg.h",
use "bora/guestABI/include/vmware/guestrpc/deploypkg.h" instead.
Combined macro definition to the new header file and modified
reference accordingly.
3. Modified makefile for open-vm-tools to consume new header file,
removed old header file staging in open-vm-tools.stage
---

diff --git a/open-vm-tools/lib/include/vmware/guestrpc/deploypkg.h b/open-vm-tools/lib/include/vmware/guestrpc/deploypkg.h
index df758b1fc..9201c03a4 100644
--- a/open-vm-tools/lib/include/vmware/guestrpc/deploypkg.h
+++ b/open-vm-tools/lib/include/vmware/guestrpc/deploypkg.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2006-2016 VMware, Inc. All rights reserved.
+ * Copyright (C) 2006-2017 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
@@ -40,11 +40,14 @@ typedef enum {
 
 typedef enum {
    TOOLSDEPLOYPKG_ERROR_SUCCESS = 0,
-   TOOLSDEPLOYPKG_ERROR_NOT_SUPPORT,       // Old tools do not support opetion
+   TOOLSDEPLOYPKG_ERROR_NOT_SUPPORT,       // Old tools do not support option
    TOOLSDEPLOYPKG_ERROR_PKG_NOT_FOUND,     // Specified pkg is not found
    TOOLSDEPLOYPKG_ERROR_RPC_INVALID,
    TOOLSDEPLOYPKG_ERROR_COPY_FAILED,
    TOOLSDEPLOYPKG_ERROR_DEPLOY_FAILED,
 } ToolsDeployPkgError;
 
+#define QUERY_NICS_SUPPORTED  "queryNicsSupported"
+#define NICS_STATUS_CONNECTED "connected"
+
 #endif //__TOOLS_DEPLOYPKG_H_
diff --git a/open-vm-tools/libDeployPkg/Makefile.am b/open-vm-tools/libDeployPkg/Makefile.am
index 699b6a821..9af3a52ba 100644
--- a/open-vm-tools/libDeployPkg/Makefile.am
+++ b/open-vm-tools/libDeployPkg/Makefile.am
@@ -1,5 +1,5 @@
 ################################################################################
-### Copyright (C) 2014-2016 VMware, Inc.  All rights reserved.
+### Copyright (C) 2014-2017 VMware, Inc.  All rights reserved.
 ###
 ### This program is free software; you can redistribute it and/or modify
 ### it under the terms of version 2 of the GNU General Public License as
@@ -33,7 +33,6 @@ libDeployPkg_la_SOURCES += mspackWrapper.h
 libDeployPkg_la_SOURCES += processPosix.c
 libDeployPkg_la_SOURCES += linuxDeploymentUtilities.c
 libDeployPkg_la_SOURCES += linuxDeploymentUtilities.h
-libDeployPkg_la_SOURCES += toolsDeployPkg.h
 
 libDeployPkg_la_LDFLAGS =
 # We require GCC, so we're fine passing compiler-specific flags.
@@ -51,6 +50,7 @@ libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/imgcust-guest/guestcus
 libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/vm_basic_types.h
 libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/rpcout.h
 libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/deployPkg/linuxDeployment.h
+libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/vmware/guestrpc/deploypkg.h
 
 EXTRA_DIST = libDeployPkg.pc.in
 
diff --git a/open-vm-tools/libDeployPkg/toolsDeployPkg.h b/open-vm-tools/libDeployPkg/toolsDeployPkg.h
deleted file mode 100644
index 8e8eab183..000000000
--- a/open-vm-tools/libDeployPkg/toolsDeployPkg.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*********************************************************
- * Copyright (C) 2006-2016 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
- * by the Free Software Foundation version 2.1 and no later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the Lesser GNU General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *********************************************************/
-
-/*
- * toolsDeployPkg.h --
- *
- *      Define constants & exported methods related to tools package deployment.
- */
-
-#ifndef __TOOLS_DEPLOYPKG_H_
-#define __TOOLS_DEPLOYPKG_H_
-
-#define INCLUDE_ALLOW_USERLEVEL
-#include "includeCheck.h"
-
-typedef enum {
-   TOOLSDEPLOYPKG_IDLE = 0,
-   TOOLSDEPLOYPKG_PENDING,
-   TOOLSDEPLOYPKG_COPYING,
-   TOOLSDEPLOYPKG_DEPLOYING,
-   TOOLSDEPLOYPKG_RUNNING,
-   TOOLSDEPLOYPKG_DONE
-} ToolsDeployPackageState;
-
-typedef enum {
-   TOOLSDEPLOYPKG_ERROR_SUCCESS = 0,
-   TOOLSDEPLOYPKG_ERROR_NOT_SUPPORT,       // Old tools do not support option.
-   TOOLSDEPLOYPKG_ERROR_PKG_NOT_FOUND,     // Specified pkg is not found.
-   TOOLSDEPLOYPKG_ERROR_RPC_INVALID,
-   TOOLSDEPLOYPKG_ERROR_COPY_FAILED,
-   TOOLSDEPLOYPKG_ERROR_DEPLOY_FAILED,
-} ToolsDeployPkgError;
-
-
-/*
- *------------------------------------------------------------------------------
- *
- * ToolsDeployPkg_PowerOn --
- *
- *      Tools callback for PowerOn.
- *
- *------------------------------------------------------------------------------
- */
-
-Bool
-ToolsDeployPkg_PowerOn(void);
-
-
-/*
- *------------------------------------------------------------------------------
- *
- * ToolsDeployPkg_PowerOn --
- *
- *      Tools callback for Begin.
- *
- *------------------------------------------------------------------------------
- */
-
-void
-ToolsDeployPkg_Begin(void);
-
-#define QUERY_NICS_SUPPORTED  "queryNicsSupported"
-#define NICS_STATUS_CONNECTED "connected"
-
-#endif //__TOOLS_DEPLOYPKG_H_