diff options
| author | William A. Kennington III <wak@google.com> | 2019-02-07 15:15:44 -0800 |
|---|---|---|
| committer | William A. Kennington III <wak@google.com> | 2019-02-12 11:48:56 -0800 |
| commit | acebece38c2c169177bb70e24141e099d873af30 (patch) | |
| tree | 40ef7370647126f96e2b09d466b95dc763514499 | |
| parent | 4beac9a0eb11f122ed4e007cc491708c85b7cc90 (diff) | |
| download | phosphor-ipmi-blobs-acebece38c2c169177bb70e24141e099d873af30.tar.gz phosphor-ipmi-blobs-acebece38c2c169177bb70e24141e099d873af30.zip | |
Convert host-ipmid -> libipmid
phosphor-host-ipmid now exposes a library along with headers for
interfacing with the ipmi daemon. Compile and link against the new
library.
Change-Id: I663e6607f711bc8bae0a2127db524868f6d4cc32
Signed-off-by: William A. Kennington III <wak@google.com>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | ipmi.hpp | 2 | ||||
| -rw-r--r-- | main.cpp | 8 | ||||
| -rw-r--r-- | manager.hpp | 2 | ||||
| -rw-r--r-- | process.hpp | 2 |
6 files changed, 14 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 1008449..3b57953 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,6 +17,7 @@ libblobcmds_la_LDFLAGS = \ $(SYSTEMD_LIBS) \ $(LIBADD_DLOPEN) \ $(PHOSPHOR_LOGGING_LIBS) \ + $(LIBIPMID_LIBS) \ -lstdc++fs \ -export-dynamic \ -version-info 0:0:0 -shared @@ -24,6 +25,7 @@ libblobcmds_la_LDFLAGS = \ libblobcmds_la_CXXFLAGS = \ $(SYSTEMD_CFLAGS) \ $(PHOSPHOR_LOGGING_CFLAGS) \ + $(LIBIPMID_CFLAGS) \ -flto nobase_include_HEADERS = \ diff --git a/configure.ac b/configure.ac index 7fb93d5..ebd6a70 100644 --- a/configure.ac +++ b/configure.ac @@ -28,9 +28,11 @@ PKG_CHECK_MODULES( [], [AC_MSG_ERROR([Could not find phosphor-logging...openbmc/phosphor-logging package required])] ) -AC_CHECK_HEADER( - [host-ipmid], - [AC_MSG_ERROR(["phosphor-host-ipmid required and not found."])] +PKG_CHECK_MODULES( + [LIBIPMID], + [libipmid], + [], + [AC_MSG_ERROR([Could not find libipmid...openbmc/phosphor-host-ipmid package required])] ) AC_CHECK_HEADER( experimental/filesystem, @@ -2,7 +2,7 @@ #include "manager.hpp" -#include <host-ipmid/ipmid-api.h> +#include <ipmid/api.h> #include <blobs-ipmid/blobs.hpp> #include <string> @@ -21,12 +21,12 @@ #include "process.hpp" #include "utils.hpp" -#include <host-ipmid/ipmid-api.h> +#include <ipmid/api.h> #include <cstdio> -#include <host-ipmid/iana.hpp> -#include <host-ipmid/oemopenbmc.hpp> -#include <host-ipmid/oemrouter.hpp> +#include <ipmid/iana.hpp> +#include <ipmid/oemopenbmc.hpp> +#include <ipmid/oemrouter.hpp> #include <memory> #include <phosphor-logging/log.hpp> diff --git a/manager.hpp b/manager.hpp index c0c4249..4caf4ea 100644 --- a/manager.hpp +++ b/manager.hpp @@ -2,7 +2,7 @@ #include <blobs-ipmid/blobs.hpp> #include <ctime> -#include <host-ipmid/oemrouter.hpp> +#include <ipmid/oemrouter.hpp> #include <memory> #include <string> #include <unordered_map> diff --git a/process.hpp b/process.hpp index af19b22..390bc1a 100644 --- a/process.hpp +++ b/process.hpp @@ -3,7 +3,7 @@ #include "crc.hpp" #include "manager.hpp" -#include <host-ipmid/ipmid-api.h> +#include <ipmid/api.h> #include <functional> |
