diff options
author | Khem Raj <raj.khem@gmail.com> | 2023-01-11 10:18:45 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2023-01-11 10:20:40 -0800 |
commit | cadbdb28afc15265eb323caba28230802c42313e (patch) | |
tree | 7412a08c4f6024ec4ae7e121231180ab3190d328 /meta-oe/recipes-kernel/ipmitool | |
parent | eef459db7c74ae8b8f9fe68f428790771f5fcfec (diff) | |
download | meta-openembedded-cadbdb28afc15265eb323caba28230802c42313e.tar.gz |
ipmitool: Remove unneeded patch
This has been fixed with [1]
[1] https://github.com/ipmitool/ipmitool/commit/1724b031
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-kernel/ipmitool')
-rw-r--r-- | meta-oe/recipes-kernel/ipmitool/ipmitool/0001-ipmi_fru.c-Provide-missing-function-declarations.patch | 34 | ||||
-rw-r--r-- | meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb | 1 |
2 files changed, 0 insertions, 35 deletions
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 704bbdb5c..000000000 --- a/meta-oe/recipes-kernel/ipmitool/ipmitool/0001-ipmi_fru.c-Provide-missing-function-declarations.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From e5bbf96edf776821f29ab67baed22a690bf8ab10 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 2 Sep 2022 07:30:10 -0700 | ||
4 | Subject: [PATCH] ipmi_fru.c: Provide missing function declarations | ||
5 | |||
6 | Fixes build with clang-15+ | ||
7 | |||
8 | Upstream-Status: Submitted [https://github.com/ipmitool/ipmitool/pull/360] | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | lib/ipmi_fru.c | 7 +++++++ | ||
12 | 1 file changed, 7 insertions(+) | ||
13 | |||
14 | diff --git a/lib/ipmi_fru.c b/lib/ipmi_fru.c | ||
15 | index 3d1d8a1..5c5661c 100644 | ||
16 | --- a/lib/ipmi_fru.c | ||
17 | +++ b/lib/ipmi_fru.c | ||
18 | @@ -60,6 +60,13 @@ static const char *section_id[4] = { | ||
19 | "Board Section", | ||
20 | "Product Section" | ||
21 | }; | ||
22 | +/* From lib/ipmi_hpmfwupg.c: */ | ||
23 | +uint16_t | ||
24 | +ipmi_intf_get_max_request_data_size(struct ipmi_intf * intf); | ||
25 | + | ||
26 | +/* From src/plugins/ipmi_intf.c: */ | ||
27 | +uint16_t | ||
28 | +ipmi_intf_get_max_response_data_size(struct ipmi_intf * intf); | ||
29 | |||
30 | static const char * combined_voltage_desc[] = { | ||
31 | "12 V", | ||
32 | -- | ||
33 | 2.37.3 | ||
34 | |||
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 a8d203e59..0340901c2 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" | |||
24 | SRCREV = "19d78782d795d0cf4ceefe655f616210c9143e62" | 24 | SRCREV = "19d78782d795d0cf4ceefe655f616210c9143e62" |
25 | SRC_URI = "git://github.com/ipmitool/ipmitool;protocol=https;branch=master \ | 25 | SRC_URI = "git://github.com/ipmitool/ipmitool;protocol=https;branch=master \ |
26 | ${IANA_ENTERPRISE_NUMBERS} \ | 26 | ${IANA_ENTERPRISE_NUMBERS} \ |
27 | file://0001-ipmi_fru.c-Provide-missing-function-declarations.patch \ | ||
28 | file://0001-configure-Remove-the-logic-to-download-IANA-PEN-data.patch \ | 27 | file://0001-configure-Remove-the-logic-to-download-IANA-PEN-data.patch \ |
29 | " | 28 | " |
30 | IANA_ENTERPRISE_NUMBERS ?= "" | 29 | IANA_ENTERPRISE_NUMBERS ?= "" |