diff options
author | Kang Kai <kai.kang@windriver.com> | 2015-07-17 11:10:02 +0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-07-30 21:03:27 +0200 |
commit | cfe72b6070fab0b57603eb26193caa58c6d9a206 (patch) | |
tree | 392ea9e0fc645e1ba84da9d1b79b7ef0ece4af3e /meta-oe/recipes-support/lvm2/lvm2 | |
parent | 0627251be644bb3c4cbc46eb7a33801afb5aefe9 (diff) | |
download | meta-openembedded-cfe72b6070fab0b57603eb26193caa58c6d9a206.tar.gz |
lvm2: upgrade from 2.02.97 to 2.02.125
Upgrade lvm2 to 2.02.125:
* drop 3 backported patches
* remove PR and INC_PR
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/lvm2/lvm2')
3 files changed, 0 insertions, 93 deletions
diff --git a/meta-oe/recipes-support/lvm2/lvm2/0001-Replace-CPPFunction-with-rl_completion_func_t.patch b/meta-oe/recipes-support/lvm2/lvm2/0001-Replace-CPPFunction-with-rl_completion_func_t.patch deleted file mode 100644 index 98c21fdb3..000000000 --- a/meta-oe/recipes-support/lvm2/lvm2/0001-Replace-CPPFunction-with-rl_completion_func_t.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From e2484e179c389b98366c8b66b451d9d2ba8f35e8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Zhenhua Luo <zhenhua.luo@freescale.com> | ||
3 | Date: Tue, 25 Mar 2014 17:39:43 +0800 | ||
4 | Subject: [PATCH] Replace CPPFunction with rl_completion_func_t | ||
5 | |||
6 | lvm2 depends on readline, CPPFunction has been replaced by rl_completion_func_t | ||
7 | in recent readline, | ||
8 | |||
9 | Upstream-Status: Inappropriate [configuration] | ||
10 | The change depends on the build environment, it is required by OpenEmbedded env | ||
11 | due to readline upgrade. | ||
12 | |||
13 | Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> | ||
14 | --- | ||
15 | tools/lvm.c | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/tools/lvm.c b/tools/lvm.c | ||
19 | index e002a76..5fa35d2 100644 | ||
20 | --- a/tools/lvm.c | ||
21 | +++ b/tools/lvm.c | ||
22 | @@ -186,7 +186,7 @@ int lvm_shell(struct cmd_context *cmd, struct cmdline_context *cmdline) | ||
23 | char *input = NULL, *args[MAX_ARGS], **argv; | ||
24 | |||
25 | rl_readline_name = "lvm"; | ||
26 | - rl_attempted_completion_function = (CPPFunction *) _completion; | ||
27 | + rl_attempted_completion_function = (rl_completion_func_t *) _completion; | ||
28 | |||
29 | _read_history(cmd); | ||
30 | |||
31 | -- | ||
32 | 1.9.1 | ||
33 | |||
diff --git a/meta-oe/recipes-support/lvm2/lvm2/0001-snapshot-check-snapshot-exists.patch b/meta-oe/recipes-support/lvm2/lvm2/0001-snapshot-check-snapshot-exists.patch deleted file mode 100644 index 8f0da796d..000000000 --- a/meta-oe/recipes-support/lvm2/lvm2/0001-snapshot-check-snapshot-exists.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From c46d4a745dc8c5cb4cfc0c94863e555387e9af75 Mon Sep 17 00:00:00 2001 | ||
2 | From: Zdenek Kabelac <zkabelac@redhat.com> | ||
3 | Date: Mon, 16 Jun 2014 12:41:30 +0200 | ||
4 | Subject: [PATCH] snapshot: check snapshot exists | ||
5 | |||
6 | Return 0 if the LV is not even snapshot. | ||
7 | |||
8 | Upstream-Status: backport | ||
9 | Adapt the patch for backporting to an older version. | ||
10 | Signed-off-by: Li Zhou <li.zhou@windriver.com> | ||
11 | --- | ||
12 | lib/metadata/snapshot_manip.c | 3 ++- | ||
13 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
14 | |||
15 | Index: LVM2.2.02.97/lib/metadata/snapshot_manip.c | ||
16 | =================================================================== | ||
17 | --- LVM2.2.02.97.orig/lib/metadata/snapshot_manip.c | ||
18 | +++ LVM2.2.02.97/lib/metadata/snapshot_manip.c | ||
19 | @@ -68,8 +68,9 @@ struct lv_segment *find_merging_cow(cons | ||
20 | |||
21 | int lv_is_merging_cow(const struct logical_volume *snapshot) | ||
22 | { | ||
23 | + struct lv_segment *snap_seg = find_cow(snapshot); | ||
24 | /* checks lv_segment's status to see if cow is merging */ | ||
25 | - return (find_cow(snapshot)->status & MERGING) ? 1 : 0; | ||
26 | + return (snap_seg && (snap_seg->status & MERGING)) ? 1 : 0; | ||
27 | } | ||
28 | |||
29 | /* Given a cow LV, return the snapshot lv_segment that uses it */ | ||
diff --git a/meta-oe/recipes-support/lvm2/lvm2/mlock-ignore-vectors-gate_vma.patch b/meta-oe/recipes-support/lvm2/lvm2/mlock-ignore-vectors-gate_vma.patch deleted file mode 100644 index 310513679..000000000 --- a/meta-oe/recipes-support/lvm2/lvm2/mlock-ignore-vectors-gate_vma.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | Subject: [PATCH] fix: mlock ignore [vectors] gate_vma | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | linux kernel has a new commit f9d4861f for [vectors] vma on ARM | ||
6 | "ARM: 7294/1: vectors: use gate_vma for vectors user mapping". | ||
7 | |||
8 | mlock()/munlock() on a gate_vma would cause NOMEM error, so add | ||
9 | [vectors] to _ignore_maps[], as other gate_vmas [vdso]/[vsyscall] | ||
10 | did. | ||
11 | |||
12 | Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com> | ||
13 | --- | ||
14 | lib/mm/memlock.c | 1 + | ||
15 | 1 file changed, 1 insertion(+) | ||
16 | |||
17 | diff --git a/lib/mm/memlock.c b/lib/mm/memlock.c | ||
18 | index 8c631bf..a6b1955 100644 | ||
19 | --- a/lib/mm/memlock.c | ||
20 | +++ b/lib/mm/memlock.c | ||
21 | @@ -84,6 +84,7 @@ static int _default_priority; | ||
22 | static const char * const _ignore_maps[] = { | ||
23 | "[vdso]", | ||
24 | "[vsyscall]", | ||
25 | + "[vectors]", | ||
26 | }; | ||
27 | |||
28 | /* default blacklist for maps */ | ||
29 | -- | ||
30 | 1.7.9.5 | ||
31 | |||