From 1afc4f54369c50a7c9a3b6038e31124f88795728 Mon Sep 17 00:00:00 2001 From: Til Kaiser Date: Thu, 14 Aug 2025 10:25:53 +0200 Subject: [PATCH] mstflint: update to 4.33.0 This commit updates the mstflint package to the latest 4.33.0 release. Obsolete patches have been removed, as they are now included in this version. Signed-off-by: Til Kaiser --- utils/mstflint/Makefile | 6 +- ...e-sys-types-h-for-musl-compatibility.patch | 65 ------------------- 2 files changed, 3 insertions(+), 68 deletions(-) delete mode 100644 utils/mstflint/patches/0001-pldmlib-include-sys-types-h-for-musl-compatibility.patch diff --git a/utils/mstflint/Makefile b/utils/mstflint/Makefile index 18f86f39ec..a5ee1e7141 100644 --- a/utils/mstflint/Makefile +++ b/utils/mstflint/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mstflint -PKG_VERSION:=4.32.0 +PKG_VERSION:=4.33.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-1.tar.gz PKG_SOURCE_URL:=https://github.com/Mellanox/$(PKG_NAME)/releases/download/v$(PKG_VERSION)-1 -PKG_SOURCE_DATE:=2025-05-08 -PKG_HASH:=74db217a49f5efbd29b00ac8bc19d18e3407409cea37ac4e0c63dad95b8ca076 +PKG_SOURCE_DATE:=2025-08-14 +PKG_HASH:=103cdc6230bf3579a40e9dd1c998180bc45b053fbbaec2f16a7f2cd96772481f PKG_MAINTAINER:=Til Kaiser PKG_LICENSE:=GPL-2.0-only diff --git a/utils/mstflint/patches/0001-pldmlib-include-sys-types-h-for-musl-compatibility.patch b/utils/mstflint/patches/0001-pldmlib-include-sys-types-h-for-musl-compatibility.patch deleted file mode 100644 index 4e3dff2383..0000000000 --- a/utils/mstflint/patches/0001-pldmlib-include-sys-types-h-for-musl-compatibility.patch +++ /dev/null @@ -1,65 +0,0 @@ -From e674e1e15cdbae9911699bad071bb2992c4ed5a5 Mon Sep 17 00:00:00 2001 -From: Til Kaiser -Date: Fri, 9 May 2025 15:04:37 +0200 -Subject: [PATCH] pldmlib: include for musl compatibility - -Currently, the following errors occur when attempting to -compile the latest mstflint release using the musl toolchain: - -In file included from pldm_utils.cpp:21: -pldm_utils.h:63:22: error: 'u_int32_t' was not declared in this scope; did you mean 'uint32_t'? - 63 | std::string NumToStr(u_int32_t num); - | ^~~~~~~~~ - | uint32_t -pldm_utils.h:66:80: error: 'u_int16_t' has not been declared - 66 | void ComponentIdentifierToStringValue(ComponentIdentifier componentIdentifier, u_int16_t field, std::string& value); - | ^~~~~~~~~ -pldm_utils.h:67:74: error: 'u_int16_t' has not been declared - 67 | void ComponentIdentifierToValue(ComponentIdentifier componentIdentifier, u_int16_t field, u_int16_t& value); - | ^~~~~~~~~ -pldm_utils.h:67:91: error: 'u_int16_t' has not been declared - 67 | void ComponentIdentifierToValue(ComponentIdentifier componentIdentifier, u_int16_t field, u_int16_t& value); - | ^~~~~~~~~ -pldm_utils.h:70:7: error: 'u_int8_t' does not name a type; did you mean 'uint8_t'? - 70 | const u_int8_t expectedHeaderIdentifier[16] = {0xf0, 0x18, 0x87, 0x8c, 0xcb, 0x7d, 0x49, 0x43, - | ^~~~~~~~ - | uint8_t -pldm_utils.cpp:64:8: error: redefinition of 'std::string NumToStr' - 64 | string NumToStr(u_int32_t num) - | ^~~~~~~~ -pldm_utils.h:63:13: note: 'std::string NumToStr' previously declared here - 63 | std::string NumToStr(u_int32_t num); - | ^~~~~~~~ -pldm_utils.cpp:64:17: error: 'u_int32_t' was not declared in this scope; did you mean 'uint32_t'? - 64 | string NumToStr(u_int32_t num) - | ^~~~~~~~~ - | uint32_t -pldm_utils.cpp:89:80: error: 'u_int16_t' has not been declared - 89 | void ComponentIdentifierToStringValue(ComponentIdentifier componentIdentifier, u_int16_t field, string& value) - | ^~~~~~~~~ -pldm_utils.cpp:108:74: error: 'u_int16_t' has not been declared - 108 | void ComponentIdentifierToValue(ComponentIdentifier componentIdentifier, u_int16_t field, u_int16_t& value) - | ^~~~~~~~~ -pldm_utils.cpp:108:91: error: 'u_int16_t' has not been declared - 108 | void ComponentIdentifierToValue(ComponentIdentifier componentIdentifier, u_int16_t field, u_int16_t& value) - | ^~~~~~~~~ -make[5]: *** [Makefile:507: pldm_utils.lo] Error 1 - -This issue arises because musl's stdlib.h does not include , unlike the glibc toolchain. -This patch manually includes to resolve the problem. - -Signed-off-by: Til Kaiser ---- - pldmlib/pldm_utils.h | 1 + - 1 file changed, 1 insertion(+) - ---- a/pldmlib/pldm_utils.h -+++ b/pldmlib/pldm_utils.h -@@ -13,6 +13,7 @@ - #ifndef PLDM_UTILS_H_ - #define PLDM_UTILS_H_ - -+#include - #include - #include - #include -- 2.30.2