Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / phosphor-bmc-code-mgmt / 24a8d83d68af09e4b59882481a61e9206bfac556
commit24a8d83d68af09e4b59882481a61e9206bfac556[log] [tgz]
authorAdriana Kobylak <anoo@us.ibm.com>Wed Jun 10 08:29:36 2020 -0500
committerAdriana Kobylak <anoo@us.ibm.com>Wed Jun 10 10:38:28 2020 -0500
treeb9875a6030969705effad8e4415d47542cf5df45
parent58aa75083162fa5662673511b43d423baeecf52f [diff]
item_updater: Use relative path to append OS_RELEASE_FILE

The path append behavior changed between std::experimental and
std::filesystem where appending an absolute path replaces the path
instead of appending, therefore need to use .relative_path().

This was causing the item updater to recreate the d-bus objects with
version OS_RELEASE_FILE instead of MEDIA_DIR/rofs-x/OS_RELEASE_FILE
marking the 2 versions of the system functional and with the same
version string.

Fixes openbmc/phosphor-bmc-code-mgmt#5

Tested: Verified with debug logs that the path was just OS_RELEASE_FILE
        without this change, and it was MEDIA_DIR/rofs-x/OS_RELEASE_FILE
        after this change, the version strings were correct, and only 1
        functional BMC association was created.

Change-Id: I2f81942d7fbb24e839e8f712cd2d84a80b7cd125
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
1 file changed
tree: b9875a6030969705effad8e4415d47542cf5df45
  1. static/
  2. test/
  3. ubi/
  4. xyz/
  5. .clang-format
  6. .gitignore
  7. activation.cpp
  8. activation.hpp
  9. download_manager.cpp
  10. download_manager.hpp
  11. download_manager_main.cpp
  12. elog-errors.hpp
  13. flash.hpp
  14. force-reboot.service
  15. gen-bios-tar
  16. image_manager.cpp
  17. image_manager.hpp
  18. image_manager_main.cpp
  19. image_verify.cpp
  20. image_verify.hpp
  21. images.hpp
  22. item_updater.cpp
  23. item_updater.hpp
  24. item_updater_helper.hpp
  25. item_updater_main.cpp
  26. LICENSE
  27. MAINTAINERS
  28. meson.build
  29. meson_options.txt
  30. obmc-flash-bmc
  31. obmc-flash-bmc-setenv@.service
  32. obmc-flash-host-bios@.service
  33. openssl_alloc.cpp
  34. openssl_alloc.hpp
  35. README.md
  36. reboot-guard-disable.service
  37. reboot-guard-enable.service
  38. serialize.cpp
  39. serialize.hpp
  40. software.conf
  41. sync_manager.cpp
  42. sync_manager.hpp
  43. sync_manager_main.cpp
  44. sync_watch.cpp
  45. sync_watch.hpp
  46. synclist
  47. usr-local.mount
  48. utils.cpp
  49. utils.hpp
  50. version.cpp
  51. version.hpp
  52. watch.cpp
  53. watch.hpp
  54. xyz.openbmc_project.Software.BMC.Updater.service
  55. xyz.openbmc_project.Software.Download.service
  56. xyz.openbmc_project.Software.Sync.service
  57. xyz.openbmc_project.Software.Version.service
README.md

phosphor-bmc-code-mgmt

Phosphor BMC Code Management provides a set of system software management applications. More information can be found at Software Architecture

To Build

To build this package, do the following steps:

  1. meson build
  2. ninja -C build

To clean the repository run rm -r build.