file_io_type_lid.hpp: Update LID paths
The eMMC will create symlinks to the running version of host fw
and to the alternate (non-running) version. Update the
paths for those and the patch path. Rename them because T and P
are just labels and can be renamed, but the host fw version does
not change until a BMC reboot is issued.
Default running to T. At a later time, pldm can make changes to
determine if P/T is the running or non-running sides.
Change-Id: I72e374bf33cab59bd258adef713446af624161a9
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
diff --git a/meson.build b/meson.build
index 87905a2..2451693 100644
--- a/meson.build
+++ b/meson.build
@@ -22,9 +22,9 @@
conf_data.set_quoted('EVENTS_JSONS_DIR', '/usr/share/pldm/events')
if get_option('oem-ibm').enabled()
conf_data.set_quoted('FILE_TABLE_JSON', '/usr/share/pldm/fileTable.json')
- conf_data.set_quoted('LID_PERM_DIR', '/usr/share/host-fw')
- conf_data.set_quoted('LID_TEMP_DIR', '/usr/share/host-fw')
- conf_data.set_quoted('LID_PATCH_DIR', '/usr/local/share/host-fw')
+ conf_data.set_quoted('LID_RUNNING_DIR', '/var/lib/phosphor-software-manager/hostfw/running')
+ conf_data.set_quoted('LID_ALTERNATE_DIR', '/var/lib/phosphor-software-manager/hostfw/alternate')
+ conf_data.set_quoted('LID_PATCH_DIR', '/usr/local/share/hostfw/')
conf_data.set('DMA_MAXSIZE', get_option('oem-ibm-dma-maxsize'))
add_global_arguments('-DOEM_IBM', language : 'c')
add_global_arguments('-DOEM_IBM', language : 'cpp')
diff --git a/oem/ibm/libpldmresponder/file_io_type_lid.hpp b/oem/ibm/libpldmresponder/file_io_type_lid.hpp
index ef9c221..3acf883 100644
--- a/oem/ibm/libpldmresponder/file_io_type_lid.hpp
+++ b/oem/ibm/libpldmresponder/file_io_type_lid.hpp
@@ -28,7 +28,7 @@
*/
LidHandler(uint32_t fileHandle, bool permSide) : FileHandler(fileHandle)
{
- std::string dir = permSide ? LID_PERM_DIR : LID_TEMP_DIR;
+ std::string dir = permSide ? LID_ALTERNATE_DIR : LID_RUNNING_DIR;
std::stringstream stream;
stream << std::hex << fileHandle;
auto lidName = stream.str() + ".lid";