diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-04-02 09:10:38 -0400 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-04-02 09:10:40 -0400 |
| commit | 62adf60cfb9ef9729fa028c212e811cdad9c452c (patch) | |
| tree | dbe2d841fe932936779b96d25480007e572a62aa /meta-openstack | |
| parent | 1c1c3eb2eb5c0118ce25105dda1e99258ab6906b (diff) | |
| download | meta-cloud-services-62adf60cfb9ef9729fa028c212e811cdad9c452c.tar.gz | |
lvm2: drop readline patch
The lvm2 in meta-oe now deals with the readline function issues, so we
can drop the meta-cloud-services patch.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack')
| -rw-r--r-- | meta-openstack/recipes-support/lvm2/lvm2/readline-switch-to-new-style-readline-typedef.patch | 50 | ||||
| -rw-r--r-- | meta-openstack/recipes-support/lvm2/lvm2_2.02.97.bbappend | 6 |
2 files changed, 0 insertions, 56 deletions
diff --git a/meta-openstack/recipes-support/lvm2/lvm2/readline-switch-to-new-style-readline-typedef.patch b/meta-openstack/recipes-support/lvm2/lvm2/readline-switch-to-new-style-readline-typedef.patch deleted file mode 100644 index 438de2a..0000000 --- a/meta-openstack/recipes-support/lvm2/lvm2/readline-switch-to-new-style-readline-typedef.patch +++ /dev/null | |||
| @@ -1,50 +0,0 @@ | |||
| 1 | From a8dc079aa01ecb1ec349a87c18905f29829b3ae4 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Zdenek Kabelac <zkabelac@redhat.com> | ||
| 3 | Date: Thu, 6 Mar 2014 16:04:19 +0100 | ||
| 4 | Subject: [PATCH] readline: switch to new-style readline typedef | ||
| 5 | |||
| 6 | commit 216c57eed72fee52e99bb5d014c9de535e631f58 from upstream | ||
| 7 | http://git.fedorahosted.org/git/lvm2.git | ||
| 8 | |||
| 9 | Based on patch: | ||
| 10 | https://www.redhat.com/archives/lvm-devel/2014-March/msg00015.html | ||
| 11 | |||
| 12 | The CPPFunction typedef (among others) have been deprecated in favour of | ||
| 13 | specific prototyped typedefs since readline 4.2 (circa 2001). | ||
| 14 | It's been working since because compatibility typedefs have been in | ||
| 15 | place until they where removed in the recent readline 6.3 release. | ||
| 16 | Switch to the new style to avoid build breakage. | ||
| 17 | |||
| 18 | But also add full backward compatibility with define. | ||
| 19 | |||
| 20 | Signed-off-by: Gustavo Zacarias <gustavo zacarias com ar> | ||
| 21 | [MA: backport which dropped WHATS_NEW changes] | ||
| 22 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> | ||
| 23 | --- | ||
| 24 | tools/lvm.c | 3 ++- | ||
| 25 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
| 26 | |||
| 27 | diff --git a/tools/lvm.c b/tools/lvm.c | ||
| 28 | index e002a76..ac87e24 100644 | ||
| 29 | --- a/tools/lvm.c | ||
| 30 | +++ b/tools/lvm.c | ||
| 31 | @@ -27,6 +27,7 @@ int main(int argc, char **argv) | ||
| 32 | # include <readline/history.h> | ||
| 33 | # ifndef HAVE_RL_COMPLETION_MATCHES | ||
| 34 | # define rl_completion_matches(a, b) completion_matches((char *)a, b) | ||
| 35 | +# define rl_completion_func_t CPPFunction | ||
| 36 | # endif | ||
| 37 | |||
| 38 | static struct cmdline_context *_cmdline; | ||
| 39 | @@ -186,7 +187,7 @@ int lvm_shell(struct cmd_context *cmd, struct cmdline_context *cmdline) | ||
| 40 | char *input = NULL, *args[MAX_ARGS], **argv; | ||
| 41 | |||
| 42 | rl_readline_name = "lvm"; | ||
| 43 | - rl_attempted_completion_function = (CPPFunction *) _completion; | ||
| 44 | + rl_attempted_completion_function = (rl_completion_func_t *) _completion; | ||
| 45 | |||
| 46 | _read_history(cmd); | ||
| 47 | |||
| 48 | -- | ||
| 49 | 1.8.3.2 | ||
| 50 | |||
diff --git a/meta-openstack/recipes-support/lvm2/lvm2_2.02.97.bbappend b/meta-openstack/recipes-support/lvm2/lvm2_2.02.97.bbappend deleted file mode 100644 index abd0a5e..0000000 --- a/meta-openstack/recipes-support/lvm2/lvm2_2.02.97.bbappend +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
| 2 | PRINC := "${@int(PRINC) + 1}" | ||
| 3 | |||
| 4 | SRC_URI += " \ | ||
| 5 | file://readline-switch-to-new-style-readline-typedef.patch \ | ||
| 6 | " | ||
