diff options
| author | Patrick Venture <venture@google.com> | 2018-11-28 14:59:23 -0800 |
|---|---|---|
| committer | Patrick Venture <venture@google.com> | 2018-11-28 14:59:23 -0800 |
| commit | 8aee057be55156d1daec286839029bc1ee511dff (patch) | |
| tree | b83607ffb3d9ce6fd2ebe3bf4a44d60bb72e79fb | |
| parent | 540b64dbafbc20fc31d13169af5d7b18b61a4e20 (diff) | |
| download | phosphor-ipmi-blobs-8aee057be55156d1daec286839029bc1ee511dff.tar.gz phosphor-ipmi-blobs-8aee057be55156d1daec286839029bc1ee511dff.zip | |
main: receive blob handler path from configure
Add blob handler path to configure_ac and use this
path for searching.
Change-Id: Ie0e33e93822bc6e95ace2fed5abe66f42dae5ca5
Signed-off-by: Patrick Venture <venture@google.com>
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | main.cpp | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 325cc0e..667b88c 100644 --- a/configure.ac +++ b/configure.ac @@ -56,6 +56,10 @@ AS_IF([test "x$enable_oe_sdk" == "xyes"], AC_SUBST([OESDK_TESTCASE_FLAGS], [$testcase_flags]) ) +AC_ARG_VAR(BLOB_LIB_PATH, [The file path to search for libraries.]) +AS_IF([test "x$BLOB_LIB_PATH" == "x"], [BLOB_LIB_PATH="/usr/lib/blob-ipmid"]) +AC_DEFINE_UNQUOTED([BLOB_LIB_PATH], ["$BLOB_LIB_PATH"], [The file path to search for libraries.]) + # Create configured output AC_CONFIG_FILES([Makefile test/Makefile]) AC_OUTPUT @@ -60,9 +60,6 @@ static ipmi_ret_t handleBlobCommand(ipmi_cmd_t cmd, const uint8_t* reqBuf, replyCmdBuf, dataLen); } -/* TODO: this should come from the makefile or recipe... */ -constexpr auto expectedHandlerPath = "/usr/lib/blob-ipmid"; - void setupBlobGlobalHandler() __attribute__((constructor)); void setupBlobGlobalHandler() @@ -78,7 +75,7 @@ void setupBlobGlobalHandler() /* Install handlers. */ try { - loadLibraries(getBlobManager(), expectedHandlerPath); + loadLibraries(getBlobManager(), BLOB_LIB_PATH); } catch (const std::exception& e) { |
