diff options
author | Zang Ruochen <zangrc.fnst@cn.fujitsu.com> | 2019-11-13 13:25:13 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-11-14 13:21:00 +0000 |
commit | 8195cff91100a2051c19df104f46c61c7b4f3b93 (patch) | |
tree | 32a63854fb8d423c92dc668ad9120f4c6b3cd1f6 | |
parent | 85c18be8f49b34daa27a31738cb4a1f4abfb6469 (diff) | |
download | poky-8195cff91100a2051c19df104f46c61c7b4f3b93.tar.gz |
libedit: upgrade 20190324 -> 20191025
-libedit/0001-readline.c-fix-cannot-get-history.patch
Removed since this is included in 20191025-3.1.
(From OE-Core rev: a29bb560de072e669835e16d65ef50b72583a081)
Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/libedit/libedit/0001-readline.c-fix-cannot-get-history.patch | 34 | ||||
-rw-r--r-- | meta/recipes-devtools/libedit/libedit_20191025-3.1.bb (renamed from meta/recipes-devtools/libedit/libedit_20190324-3.1.bb) | 5 |
2 files changed, 2 insertions, 37 deletions
diff --git a/meta/recipes-devtools/libedit/libedit/0001-readline.c-fix-cannot-get-history.patch b/meta/recipes-devtools/libedit/libedit/0001-readline.c-fix-cannot-get-history.patch deleted file mode 100644 index 7e54ac97ea..0000000000 --- a/meta/recipes-devtools/libedit/libedit/0001-readline.c-fix-cannot-get-history.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From ef1fa9bef497d9491a51017f3cad0135a23bb0b4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Changqing Li <changqing.li@windriver.com> | ||
3 | Date: Tue, 20 Aug 2019 17:33:15 +0800 | ||
4 | Subject: [PATCH] readline.c: fix cannot get history | ||
5 | |||
6 | if history_offset not increate when add history, | ||
7 | it will make current history event not align with offset, | ||
8 | and cannot get history correctly. | ||
9 | |||
10 | Upstream-Status: Submitted [tech-userlevel@NetBSD.org] | ||
11 | |||
12 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
13 | --- | ||
14 | src/readline.c | 3 +++ | ||
15 | 1 file changed, 3 insertions(+) | ||
16 | |||
17 | diff --git a/src/readline.c b/src/readline.c | ||
18 | index 43ac5bd..54b0548 100644 | ||
19 | --- a/src/readline.c | ||
20 | +++ b/src/readline.c | ||
21 | @@ -1476,7 +1476,10 @@ add_history(const char *line) | ||
22 | if (ev.num == history_length) | ||
23 | history_base++; | ||
24 | else | ||
25 | + { | ||
26 | + history_offset++; | ||
27 | history_length = ev.num; | ||
28 | + } | ||
29 | return 0; | ||
30 | } | ||
31 | |||
32 | -- | ||
33 | 2.7.4 | ||
34 | |||
diff --git a/meta/recipes-devtools/libedit/libedit_20190324-3.1.bb b/meta/recipes-devtools/libedit/libedit_20191025-3.1.bb index 25667ccce7..f810013a68 100644 --- a/meta/recipes-devtools/libedit/libedit_20190324-3.1.bb +++ b/meta/recipes-devtools/libedit/libedit_20191025-3.1.bb | |||
@@ -12,9 +12,8 @@ inherit autotools | |||
12 | 12 | ||
13 | SRC_URI = "http://www.thrysoee.dk/editline/${BP}.tar.gz \ | 13 | SRC_URI = "http://www.thrysoee.dk/editline/${BP}.tar.gz \ |
14 | file://stdc-predef.patch \ | 14 | file://stdc-predef.patch \ |
15 | file://0001-readline.c-fix-cannot-get-history.patch \ | ||
16 | " | 15 | " |
17 | SRC_URI[md5sum] = "bec755c8044ad84b752dfe49a0b371d8" | 16 | SRC_URI[md5sum] = "2d6568467080cfd75e715d045102b544" |
18 | SRC_URI[sha256sum] = "ac8f0f51c1cf65492e4d1e3ed2be360bda41e54633444666422fbf393bba1bae" | 17 | SRC_URI[sha256sum] = "6dff036660d478bfaa14e407fc5de26d22da1087118c897b1a3ad2e90cb7bf39" |
19 | 18 | ||
20 | BBCLASSEXTEND = "native nativesdk" | 19 | BBCLASSEXTEND = "native nativesdk" |