Patchwork [meta-networking] quagga: work with new readline

login
register
mail settings
Submitter Robert Yang
Date March 27, 2014, 9:52 a.m.
Message ID <1395913975-24059-1-git-send-email-liezhi.yang@windriver.com>
Download mbox | patch
Permalink /patch/69381/
State New, archived
Headers show

Comments

Robert Yang - March 27, 2014, 9:52 a.m.
The Function and CPPFunction had been removed by in readline 6.3, use
the new functions to replace them.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../quagga/files/work-with-new-readline.patch      | 34 ++++++++++++++++++++++
 .../recipes-protocols/quagga/quagga_0.99.21.bb     |  1 +
 2 files changed, 35 insertions(+)
 create mode 100644 meta-networking/recipes-protocols/quagga/files/work-with-new-readline.patch
Joe MacDonald - March 27, 2014, 8:27 p.m.
Merged, thanks.
-J.

[[oe] [meta-networking] [PATCH] quagga: work with new readline] On 14.03.27 (Thu 17:52) Robert Yang wrote:

> The Function and CPPFunction had been removed by in readline 6.3, use
> the new functions to replace them.
> 
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
>  .../quagga/files/work-with-new-readline.patch      | 34 ++++++++++++++++++++++
>  .../recipes-protocols/quagga/quagga_0.99.21.bb     |  1 +
>  2 files changed, 35 insertions(+)
>  create mode 100644 meta-networking/recipes-protocols/quagga/files/work-with-new-readline.patch
> 
> diff --git a/meta-networking/recipes-protocols/quagga/files/work-with-new-readline.patch b/meta-networking/recipes-protocols/quagga/files/work-with-new-readline.patch
> new file mode 100644
> index 0000000..2bd333a
> --- /dev/null
> +++ b/meta-networking/recipes-protocols/quagga/files/work-with-new-readline.patch
> @@ -0,0 +1,34 @@
> +From 66df315d2a270a254c613a4d2e72c0ea47f15a71 Mon Sep 17 00:00:00 2001
> +From: Robert Yang <liezhi.yang@windriver.com>
> +Date: Thu, 27 Mar 2014 09:35:29 +0000
> +Subject: [PATCH] vtysh/vtysh.c: works with new readline
> +
> +The Function and CPPFunction had been removed by in readline 6.3, use
> +the new functions to replace them.
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> +---
> + vtysh/vtysh.c | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
> +index 431c08e..fdd82fb 100644
> +--- a/vtysh/vtysh.c
> ++++ b/vtysh/vtysh.c
> +@@ -2212,9 +2212,9 @@ void
> + vtysh_readline_init (void)
> + {
> +   /* readline related settings. */
> +-  rl_bind_key ('?', (Function *) vtysh_rl_describe);
> ++  rl_bind_key ('?', (rl_command_func_t *) vtysh_rl_describe);
> +   rl_completion_entry_function = vtysh_completion_entry_function;
> +-  rl_attempted_completion_function = (CPPFunction *)new_completion;
> ++  rl_attempted_completion_function = (rl_completion_func_t *)new_completion;
> +   /* do not append space after completion. It will be appended
> +    * in new_completion() function explicitly. */
> +   rl_completion_append_character = '\0';
> +-- 
> +1.8.3.4
> +
> diff --git a/meta-networking/recipes-protocols/quagga/quagga_0.99.21.bb b/meta-networking/recipes-protocols/quagga/quagga_0.99.21.bb
> index db2a67b..0988b70 100644
> --- a/meta-networking/recipes-protocols/quagga/quagga_0.99.21.bb
> +++ b/meta-networking/recipes-protocols/quagga/quagga_0.99.21.bb
> @@ -6,6 +6,7 @@ SRC_URI += "file://0001-doc-fix-makeinfo-errors-and-one-warning.patch \
>              file://lingering-IP-address-after-deletion-BZ-486.patch \
>              file://build-fix-extract.pl-for-cross-compilation.patch \
>              file://babel-close-the-stdout-stderr-as-in-other-daemons.patch \
> +            file://work-with-new-readline.patch \
>  "
>  
>  SRC_URI[quagga-0.99.21.md5sum] = "99840adbe57047c90dfba6b6ed9aec7f"
> -- 
> 1.8.3.1
>

Patch

diff --git a/meta-networking/recipes-protocols/quagga/files/work-with-new-readline.patch b/meta-networking/recipes-protocols/quagga/files/work-with-new-readline.patch
new file mode 100644
index 0000000..2bd333a
--- /dev/null
+++ b/meta-networking/recipes-protocols/quagga/files/work-with-new-readline.patch
@@ -0,0 +1,34 @@ 
+From 66df315d2a270a254c613a4d2e72c0ea47f15a71 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Thu, 27 Mar 2014 09:35:29 +0000
+Subject: [PATCH] vtysh/vtysh.c: works with new readline
+
+The Function and CPPFunction had been removed by in readline 6.3, use
+the new functions to replace them.
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ vtysh/vtysh.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
+index 431c08e..fdd82fb 100644
+--- a/vtysh/vtysh.c
++++ b/vtysh/vtysh.c
+@@ -2212,9 +2212,9 @@ void
+ vtysh_readline_init (void)
+ {
+   /* readline related settings. */
+-  rl_bind_key ('?', (Function *) vtysh_rl_describe);
++  rl_bind_key ('?', (rl_command_func_t *) vtysh_rl_describe);
+   rl_completion_entry_function = vtysh_completion_entry_function;
+-  rl_attempted_completion_function = (CPPFunction *)new_completion;
++  rl_attempted_completion_function = (rl_completion_func_t *)new_completion;
+   /* do not append space after completion. It will be appended
+    * in new_completion() function explicitly. */
+   rl_completion_append_character = '\0';
+-- 
+1.8.3.4
+
diff --git a/meta-networking/recipes-protocols/quagga/quagga_0.99.21.bb b/meta-networking/recipes-protocols/quagga/quagga_0.99.21.bb
index db2a67b..0988b70 100644
--- a/meta-networking/recipes-protocols/quagga/quagga_0.99.21.bb
+++ b/meta-networking/recipes-protocols/quagga/quagga_0.99.21.bb
@@ -6,6 +6,7 @@  SRC_URI += "file://0001-doc-fix-makeinfo-errors-and-one-warning.patch \
             file://lingering-IP-address-after-deletion-BZ-486.patch \
             file://build-fix-extract.pl-for-cross-compilation.patch \
             file://babel-close-the-stdout-stderr-as-in-other-daemons.patch \
+            file://work-with-new-readline.patch \
 "
 
 SRC_URI[quagga-0.99.21.md5sum] = "99840adbe57047c90dfba6b6ed9aec7f"