From cadbdb28afc15265eb323caba28230802c42313e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 11 Jan 2023 10:18:45 -0800 Subject: ipmitool: Remove unneeded patch This has been fixed with [1] [1] https://github.com/ipmitool/ipmitool/commit/1724b031 Signed-off-by: Khem Raj --- ...u.c-Provide-missing-function-declarations.patch | 34 ---------------------- meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb | 1 - 2 files changed, 35 deletions(-) delete mode 100644 meta-oe/recipes-kernel/ipmitool/ipmitool/0001-ipmi_fru.c-Provide-missing-function-declarations.patch diff --git a/meta-oe/recipes-kernel/ipmitool/ipmitool/0001-ipmi_fru.c-Provide-missing-function-declarations.patch b/meta-oe/recipes-kernel/ipmitool/ipmitool/0001-ipmi_fru.c-Provide-missing-function-declarations.patch deleted file mode 100644 index 704bbdb5c7..0000000000 --- a/meta-oe/recipes-kernel/ipmitool/ipmitool/0001-ipmi_fru.c-Provide-missing-function-declarations.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e5bbf96edf776821f29ab67baed22a690bf8ab10 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 2 Sep 2022 07:30:10 -0700 -Subject: [PATCH] ipmi_fru.c: Provide missing function declarations - -Fixes build with clang-15+ - -Upstream-Status: Submitted [https://github.com/ipmitool/ipmitool/pull/360] -Signed-off-by: Khem Raj ---- - lib/ipmi_fru.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/lib/ipmi_fru.c b/lib/ipmi_fru.c -index 3d1d8a1..5c5661c 100644 ---- a/lib/ipmi_fru.c -+++ b/lib/ipmi_fru.c -@@ -60,6 +60,13 @@ static const char *section_id[4] = { - "Board Section", - "Product Section" - }; -+/* From lib/ipmi_hpmfwupg.c: */ -+uint16_t -+ipmi_intf_get_max_request_data_size(struct ipmi_intf * intf); -+ -+/* From src/plugins/ipmi_intf.c: */ -+uint16_t -+ipmi_intf_get_max_response_data_size(struct ipmi_intf * intf); - - static const char * combined_voltage_desc[] = { - "12 V", --- -2.37.3 - diff --git a/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb b/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb index a8d203e599..0340901c22 100644 --- a/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb +++ b/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb @@ -24,7 +24,6 @@ DEPENDS = "openssl readline ncurses" SRCREV = "19d78782d795d0cf4ceefe655f616210c9143e62" SRC_URI = "git://github.com/ipmitool/ipmitool;protocol=https;branch=master \ ${IANA_ENTERPRISE_NUMBERS} \ - file://0001-ipmi_fru.c-Provide-missing-function-declarations.patch \ file://0001-configure-Remove-the-logic-to-download-IANA-PEN-data.patch \ " IANA_ENTERPRISE_NUMBERS ?= "" -- cgit v1.2.3-54-g00ecf