refresh bootime patch Add revert sdbusplus patch since that change require the latest sdbusplus which is not in gBMC yet. That patch will be removed as soon as we bump the sbudplus version. Tested: fusion2 N/A Google-Bug-Id: 473854367 Change-Id: I96306608518225c04022a7f1e2dda4ea9dc34834 Signed-off-by: Willy Tu <wltu@google.com>
diff --git a/recipes-google/ipmi/google-ipmi-sys/0002-boot-time-monitor-Add-commands.patch b/recipes-google/ipmi/google-ipmi-sys/0002-boot-time-monitor-Add-commands.patch index 0033373..c295e56 100644 --- a/recipes-google/ipmi/google-ipmi-sys/0002-boot-time-monitor-Add-commands.patch +++ b/recipes-google/ipmi/google-ipmi-sys/0002-boot-time-monitor-Add-commands.patch
@@ -1,4 +1,4 @@ -From 6559c50036e8e83dfc535b8062fdeff7f4a2791b Mon Sep 17 00:00:00 2001 +From f564d08b3a2fa04a37b38edb7300d5f96f5ca00a Mon Sep 17 00:00:00 2001 From: Michael Shen <gpgpgp@google.com> Date: Mon, 29 Apr 2024 03:30:08 +0000 Subject: [PATCH] boot-time-monitor: Add commands @@ -303,11 +303,11 @@ +} // namespace ipmi +} // namespace google diff --git a/handler.cpp b/handler.cpp -index 8927c85..66bc0f4 100644 +index a4e8c1f..5ea5f0e 100644 --- a/handler.cpp +++ b/handler.cpp -@@ -765,6 +765,81 @@ void Handler::linuxBootDone() const - #endif +@@ -801,6 +801,81 @@ void Handler::linuxBootDone() const + #endif // IPMI_ALLOWLIST } +constexpr std::string_view BTMONITOR_SERVICE = @@ -470,7 +470,7 @@ return accelGetVrSettings(ctx, data, handler); case SysSetAccelVrSettings: diff --git a/meson.build b/meson.build -index d0b6394..5aaad08 100644 +index 9c1b718..5629568 100644 --- a/meson.build +++ b/meson.build @@ -65,6 +65,7 @@ sys_lib = static_library( @@ -951,5 +951,5 @@ 'pcie', 'poweroff', -- -2.53.0.473.g4a7958ca14-goog +2.55.0.141.g00534a21ce-goog
diff --git a/recipes-google/ipmi/google-ipmi-sys/0003-Revert-sdbusplus-use-shorter-type-aliases.patch b/recipes-google/ipmi/google-ipmi-sys/0003-Revert-sdbusplus-use-shorter-type-aliases.patch new file mode 100644 index 0000000..128870b --- /dev/null +++ b/recipes-google/ipmi/google-ipmi-sys/0003-Revert-sdbusplus-use-shorter-type-aliases.patch
@@ -0,0 +1,30 @@ +From 38654e656ea76f4bf97c9903c8ef362e1554ab2c Mon Sep 17 00:00:00 2001 +From: Willy Tu <wltu@google.com> +Date: Wed, 15 Jul 2026 16:06:41 +0000 +Subject: [PATCH] Revert "sdbusplus: use shorter type aliases" + +sdbusplus is not updated yet. + +This reverts commit 71f16d0af1ca3e046723fbcd850cb3e47e32bca3. +--- + handler.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/handler.cpp b/handler.cpp +index dec6f22..7f80b0c 100644 +--- a/handler.cpp ++++ b/handler.cpp +@@ -473,8 +473,8 @@ using AnyType = std::variant<std::string, uint8_t, uint32_t, uint64_t>; + using AnyTypeList = std::vector<std::pair<std::string, AnyType>>; + using NamedArrayOfAnyTypeLists = + std::vector<std::pair<std::string, AnyTypeList>>; +-using ArrayOfObjectPathsAndTieredAnyTypeLists = +- std::vector<std::pair<sdbusplus::object_path, NamedArrayOfAnyTypeLists>>; ++using ArrayOfObjectPathsAndTieredAnyTypeLists = std::vector< ++ std::pair<sdbusplus::message::object_path, NamedArrayOfAnyTypeLists>>; + + } // namespace + +-- +2.55.0.141.g00534a21ce-goog +
diff --git a/recipes-google/ipmi/google-ipmi-sys_%.bbappend b/recipes-google/ipmi/google-ipmi-sys_%.bbappend index f8255a1..15639c2 100644 --- a/recipes-google/ipmi/google-ipmi-sys_%.bbappend +++ b/recipes-google/ipmi/google-ipmi-sys_%.bbappend
@@ -1,6 +1,9 @@ FILESEXTRAPATHS:append:gbmc := ":${THISDIR}/${PN}" -SRC_URI:append:gbmc = " file://0001-pcie_bifurcation-Fetch-highest-level-bifurcation-at-.patch" +SRC_URI:append:gbmc = " \ + file://0001-pcie_bifurcation-Fetch-highest-level-bifurcation-at-.patch \ + file://0003-Revert-sdbusplus-use-shorter-type-aliases.patch \ +" DYNAMIC_BIFURCATION_OPTION:gbmc := "-Ddynamic-bifurcation=enabled,-Ddynamic-bifurcation=disabled" PACKAGECONFIG[dynamic-bifurcation] := "${DYNAMIC_BIFURCATION_OPTION}"