commit 6d9c83fdef63a1bc05c7b462521da3aaaa8fe038
author Jason M. Bills <jason.m.bills@linux.intel.com> Fri Feb 08 14:02:19 2019 -0800
committer Jason M. Bills <jason.m.bills@linux.intel.com> Fri Feb 08 14:02:19 2019 -0800
tree 5f375aaf3e677c92323ca7f38c5cbd9ede6cbe5e
parent e1cbc7db86ea15999141d0a58b4423a8428e78ec

intel-ipmi-oem: Update with new ipmid/api.h path

The non-Yocto build is failing after the changes to the
ipmid-api.h path, so this change updates to the new
ipmid/api.h path.

Tested: Built with and without Yocto and confirmed both
complete successfully.

Change-Id: If00684c5ca65d99879f6d606709c82d80044af95
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>

CMakeLists.txt.in

diff --git a/CMakeLists.txt.in b/CMakeLists.txt.in
index 1213120..811ad43 100644
--- a/CMakeLists.txt.in
+++ b/CMakeLists.txt.in
@@ -87,15 +87,9 @@
     ${CMAKE_BINARY_DIR}/phosphor-ipmi-host BINARY_DIR
     ${CMAKE_BINARY_DIR}/phosphor-host-ipmid-build CONFIGURE_COMMAND ""
     BUILD_COMMAND "" INSTALL_COMMAND mkdir -p
-    "${CMAKE_BINARY_DIR}/prefix/include/host-ipmid" && cp
-    ${CMAKE_BINARY_DIR}/phosphor-ipmi-host/host-ipmid/ipmid-api.h
-    ${CMAKE_BINARY_DIR}/prefix/include/host-ipmid && cp
-    ${CMAKE_BINARY_DIR}/phosphor-ipmi-host/elog-errors.hpp
-    ${CMAKE_BINARY_DIR}/prefix/include/host-ipmid && cp
-    ${CMAKE_BINARY_DIR}/phosphor-ipmi-host/utils.hpp
-    ${CMAKE_BINARY_DIR}/prefix/include/host-ipmid && cp
-    ${CMAKE_BINARY_DIR}/phosphor-ipmi-host/types.hpp
-    ${CMAKE_BINARY_DIR}/prefix/include/host-ipmid LOG_DOWNLOAD ON
+    "${CMAKE_BINARY_DIR}/prefix/include/ipmid" && cp
+    ${CMAKE_BINARY_DIR}/phosphor-ipmi-host/include/ipmid/api.h
+    ${CMAKE_BINARY_DIR}/prefix/include/ipmid LOG_DOWNLOAD ON
 )
 
 externalproject_add (

include/sensorutils.hpp

diff --git a/include/sensorutils.hpp b/include/sensorutils.hpp
index ef764a6..ffd06a0 100644
--- a/include/sensorutils.hpp
+++ b/include/sensorutils.hpp
@@ -15,7 +15,7 @@
 */
 
 #pragma once
-#include <host-ipmid/ipmid-api.h>
+#include <ipmid/api.h>
 
 #include <cmath>
 #include <iostream>

src/oemcommands.cpp

diff --git a/src/oemcommands.cpp b/src/oemcommands.cpp
index 3435a1b..0806317 100644
--- a/src/oemcommands.cpp
+++ b/src/oemcommands.cpp
@@ -16,7 +16,7 @@
 
 #include "xyz/openbmc_project/Common/error.hpp"
 
-#include <host-ipmid/ipmid-api.h>
+#include <ipmid/api.h>
 
 #include <array>
 #include <commandutils.hpp>
@@ -31,7 +31,7 @@
 namespace ipmi
 {
 static void registerOEMFunctions() __attribute__((constructor));
-sdbusplus::bus::bus dbus(ipmid_get_sd_bus_connection()); // from ipmid-api.h
+sdbusplus::bus::bus dbus(ipmid_get_sd_bus_connection()); // from ipmid/api.h
 static constexpr size_t maxFRUStringLength = 0x3F;
 
 // return code: 0 successful

src/sensorcommands.cpp

diff --git a/src/sensorcommands.cpp b/src/sensorcommands.cpp
index 849f678..16f3438 100644
--- a/src/sensorcommands.cpp
+++ b/src/sensorcommands.cpp
@@ -14,7 +14,7 @@
 // limitations under the License.
 */
 
-#include <host-ipmid/ipmid-api.h>
+#include <ipmid/api.h>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/container/flat_map.hpp>

src/storagecommands.cpp

diff --git a/src/storagecommands.cpp b/src/storagecommands.cpp
index 6dac791..c883682 100644
--- a/src/storagecommands.cpp
+++ b/src/storagecommands.cpp
@@ -14,7 +14,7 @@
 // limitations under the License.
 */
 
-#include <host-ipmid/ipmid-api.h>
+#include <ipmid/api.h>
 
 #include <boost/container/flat_map.hpp>
 #include <commandutils.hpp>