summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@cn.fujitsu.com>2020-02-27 04:43:13 -0800
committerKhem Raj <raj.khem@gmail.com>2020-02-27 08:25:49 -0800
commit90f5d4db3ec2d3e58f10a06350bc6d8188f063ec (patch)
tree3044f79927232e807b3f8d5e987051ec4e185a4a
parent0c50aa6b1f2166e83523b052cda0c52aa4156432 (diff)
downloadmeta-openembedded-90f5d4db3ec2d3e58f10a06350bc6d8188f063ec.tar.gz
openipmi: upgrade 2.0.27 -> 2.0.28
ipmi_serial_bmc_emu.c-include-readline.h-from-readli.patch removed because it is included in 2.0.28. Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-networking/recipes-support/openipmi/files/ipmi_serial_bmc_emu.c-include-readline.h-from-readli.patch31
-rw-r--r--meta-networking/recipes-support/openipmi/openipmi_2.0.28.bb (renamed from meta-networking/recipes-support/openipmi/openipmi_2.0.27.bb)5
2 files changed, 2 insertions, 34 deletions
diff --git a/meta-networking/recipes-support/openipmi/files/ipmi_serial_bmc_emu.c-include-readline.h-from-readli.patch b/meta-networking/recipes-support/openipmi/files/ipmi_serial_bmc_emu.c-include-readline.h-from-readli.patch
deleted file mode 100644
index e208de8b2..000000000
--- a/meta-networking/recipes-support/openipmi/files/ipmi_serial_bmc_emu.c-include-readline.h-from-readli.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From bebfb3c24582ec4e45d79c5b52135197bf7373da Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Fri, 14 Jun 2019 14:17:34 +0800
4Subject: [PATCH] ipmi_serial_bmc_emu.c: include readline.h from readline
5
6The libedit had been removed and swithed to readline.
7We need to include readline.h from readline rather than editline.
8
9Upstream-Status: Pending
10
11Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
12---
13 sample/ipmi_serial_bmc_emu.c | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/sample/ipmi_serial_bmc_emu.c b/sample/ipmi_serial_bmc_emu.c
17index e0ae019..1b8bb9a 100644
18--- a/sample/ipmi_serial_bmc_emu.c
19+++ b/sample/ipmi_serial_bmc_emu.c
20@@ -42,7 +42,7 @@
21 #include <unistd.h>
22 #include <stdlib.h>
23 #include <sys/select.h>
24-#include <editline/readline.h>
25+#include <readline/readline.h>
26
27 #define _GNU_SOURCE
28 #include <getopt.h>
29--
302.7.4
31
diff --git a/meta-networking/recipes-support/openipmi/openipmi_2.0.27.bb b/meta-networking/recipes-support/openipmi/openipmi_2.0.28.bb
index 126b37f11..f196eb992 100644
--- a/meta-networking/recipes-support/openipmi/openipmi_2.0.27.bb
+++ b/meta-networking/recipes-support/openipmi/openipmi_2.0.28.bb
@@ -29,15 +29,14 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openipmi/OpenIPMI-${PV}.tar.gz \
29 file://openipmi-remove-host-path-from-la_LDFLAGS.patch \ 29 file://openipmi-remove-host-path-from-la_LDFLAGS.patch \
30 file://ipmi-init-fix-the-arguments.patch \ 30 file://ipmi-init-fix-the-arguments.patch \
31 file://include_sys_types.patch \ 31 file://include_sys_types.patch \
32 file://ipmi_serial_bmc_emu.c-include-readline.h-from-readli.patch \
33 file://openipmi-helper \ 32 file://openipmi-helper \
34 file://ipmi.service \ 33 file://ipmi.service \
35 " 34 "
36 35
37S = "${WORKDIR}/OpenIPMI-${PV}" 36S = "${WORKDIR}/OpenIPMI-${PV}"
38 37
39SRC_URI[md5sum] = "d525ceaa07df5440674e7e68a6772fe7" 38SRC_URI[md5sum] = "ba37f08e306062ec73c7ed2a2bd4d5f4"
40SRC_URI[sha256sum] = "f3b1fafaaec2e2bac32fec5a86941ad8b8cb64543470bd6d819d7b166713d20b" 39SRC_URI[sha256sum] = "8e8b1de2a9a041b419133ecb21f956e999841cf2e759e973eeba9a36f8b40996"
41 40
42inherit autotools-brokensep pkgconfig python3native perlnative update-rc.d systemd cpan-base 41inherit autotools-brokensep pkgconfig python3native perlnative update-rc.d systemd cpan-base
43 42